renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
Code

- Fix the error check on master->sysclk val in the Cadence driver

Browse Source 
- Fix reattach implementation in the Designware driver
 -----BEGIN PGP SIGNATURE-----
 
 iQJKBAABCgA0FiEEKmCqpbOU668PNA69Ze02AX4ItwAFAlxBu7AWHGJicmV6aWxs
 b25Aa2VybmVsLm9yZwAKCRBl7TYBfgi3AC2LEACVDsToOGU00h3Mpl1VB4Lht1Sr
 ynHmK+e728tsw6WuM7obgXRFfEdl3J5Pt5urEn4jOqasUuew6vkp0ghakkRMkViU
 MRVYICC1imxakExkerCAO4R6+QFdK2OOPKl0o2JF3omhVz5CfZQ/FfuSzS51obgN
 Wi77IzLIxyjNnnj1Zc+Xvpa4ZgVowETTRYNdaT9/FtWAmmIaHaC8ff0a71FCHZPT
 cAYYk/wXC3oFhqN4xUWFb3H8rce/lBBLGO13+bsMSy+5lxVB6weJsxNIGVpez82+
 W4nLYjITG5KcOcNHeebQK0BVsl0ILGXh51sodcuK/7zhVbk72gZW/ZgHU9V9I2ZJ
 5tJGhKwvRl0tHAo7u5jTSi5JVuue9+h0XCx2qxG9dVY5cVbC7/vJfFPxSEFucNTV
 hNjT1A43KX8myTaK+GnRHdcxYsRWXFt1Hu0kY1OPq//ER9VKMnbE7EIuPPSKFrXy
 Q1Qk7yrrQi8CX9vqwOY/7GXGvUJsefF4JICwFs6qyAlF/EKlUcfQ65WRPOMn2gof
 bJW9QTk33EwCgJCzcP0w9EbbodQStq7a9B59ZQYl9InOHCsy9fZrSUF3LP8jR2FS
 dXvhlYKQ+V14a5TuLmPY2TjaN/nUlTEqf8JpPYGW8ed43Jdd5VwGw1oZbPpX8kkm
 aTDCW/yPXd+qAFXgvw==
 =041y
 -----END PGP SIGNATURE-----

Merge tag 'i3c/fixes-for-5.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux

Pull i3c fixes from Boris Brezillon:

 - Fix the error check on master->sysclk val in the Cadence driver

 - Fix reattach implementation in the Designware driver

* tag 'i3c/fixes-for-5.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
  i3c: master: dw-i3c-master: fix i3c_attach/reattach
  i3c: master: Fix an error checking typo in 'cdns_i3c_master_probe()'
This commit is contained in:
Linus Torvalds 2019-01-19 07:23:25 +12:00
commit 8b4fe58db6
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/i3c/master/dw-i3c-master.c
View File

@ -901,9 +901,6 @@ static int dw_i3c_master_reattach_i3c_dev(struct i3c_dev_desc *dev,
master->regs +
DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index));
if (!old_dyn_addr)
return 0;
master->addrs[data->index] = dev->info.dyn_addr;
return 0;
@ -925,11 +922,11 @@ static int dw_i3c_master_attach_i3c_dev(struct i3c_dev_desc *dev)
return -ENOMEM;
data->index = pos;
master->addrs[pos] = dev->info.dyn_addr;
master->addrs[pos] = dev->info.dyn_addr ? : dev->info.static_addr;
master->free_pos &= ~BIT(pos);
i3c_dev_set_master_data(dev, data);
writel(DEV_ADDR_TABLE_DYNAMIC_ADDR(dev->info.dyn_addr),
writel(DEV_ADDR_TABLE_DYNAMIC_ADDR(master->addrs[pos]),
master->regs +
DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index));

4
drivers/i3c/master/i3c-master-cdns.c
View File

@ -1556,8 +1556,8 @@ static int cdns_i3c_master_probe(struct platform_device *pdev)
return PTR_ERR(master->pclk);
master->sysclk = devm_clk_get(&pdev->dev, "sysclk");
if (IS_ERR(master->pclk))
return PTR_ERR(master->pclk);
if (IS_ERR(master->sysclk))
return PTR_ERR(master->sysclk);
irq = platform_get_irq(pdev, 0);
if (irq < 0)