Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-24 22:20:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

I3C for 5.13

Browse Source 
Subsystem:
  - Fix i3c_master_register error path.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEycoQi/giopmpPgB12wIijOdRNOUFAmCVk+oACgkQ2wIijOdR
 NOX+sw/8C6tJ+PSd0hNJB6WGExcabQyCdgHGPteyzp3LMvKt8V3sPpDLgK0g8jjC
 Na17CmooWQ8cQz2s/AbVhaGBi/V3HCmWhtaYPaFl/KvDVBL7RVD5NVUsqukykYaG
 DT0Wg15Wlm7ESLD059uhSl2BSSvwMB8cV/uh2zItg7dyKYfiUtrdHWHBMrWt31nQ
 VNz7T7DdKKJUQasFLDHbg1Cc1jJdextGbrNPu7gJHArGo7Gj5zbx5/HIPuy9Clro
 yUbV/n2/q/ljhM5YUFeosbOOy3FBaDJ3WK4mLV2dXYWfArsNKPfSYCmovaTwAdxV
 UI5pC3t9aiXBWFOweMUCW76//KJPjS+0lFAC/5NIBtDty1BcX7kEq9+xnKETxosq
 qMDLf0DLJHyV6ZYNF1x92QqKWxWtYG+YE6oEp7aHiQMGeGP96xp2keJFBV0mX4+4
 0t8ideDTEH8DqNV4gOBTM3qfnJN3CgWbiBS5LUqvimt1BC+Ne0IAE9mATxk+wqtn
 9v/JlM02JuaEEDIIBsBYVvP4fmpk7NzAfZxGG02o+cUAjXyH7gHdtQZGpxeSfD8U
 DttAEHNL/ZgbYtHPUFeDjoI/OyWiv/YBLR+6TJENrUDFMhXOE4O80nPUc4YJnGr6
 0G8NMjOF+HlKhf6j7YsLv9lBOIXF8s4aMv03u7YZf7zyfI22bR4=
 =KJ9U
 -----END PGP SIGNATURE-----

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

Pull i3cupdates from Alexandre Belloni:
 "Fix i3c_master_register error path"

* tag 'i3c/for-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
  Revert "i3c master: fix missing destroy_workqueue() on error in i3c_master_register"
  dt-bindings: i3c: Fix silvaco,i3c-master-v1 compatible string
  i3c: master: svc: remove redundant assignment to cmd->read_len
This commit is contained in:
Linus Torvalds 2021-05-07 13:06:34 -07:00
commit 1ad77a05cf
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
View File

@ -49,7 +49,7 @@ additionalProperties: true
examples:
- |
i3c-master@a0000000 {
compatible = "silvaco,i3c-master";
compatible = "silvaco,i3c-master-v1";
clocks = <&zynqmp_clk 71>, <&fclk>, <&sclk>;
clock-names = "pclk", "fast_clk", "slow_clk";
interrupt-parent = <&gic>;

5
drivers/i3c/master.c
View File

@ -2535,7 +2535,7 @@ int i3c_master_register(struct i3c_master_controller *master,
ret = i3c_master_bus_init(master);
if (ret)
goto err_destroy_wq;
goto err_put_dev;
ret = device_add(&master->dev);
if (ret)
@ -2566,9 +2566,6 @@ err_del_dev:
err_cleanup_bus:
i3c_master_bus_cleanup(master);
err_destroy_wq:
destroy_workqueue(master->wq);
err_put_dev:
put_device(&master->dev);

1
drivers/i3c/master/svc-i3c-master.c
View File

@ -1124,7 +1124,6 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master,
cmd->in = NULL;
cmd->out = &ccc->id;
cmd->len = 1;
cmd->read_len = xfer_len;
cmd->read_len = 0;
cmd->continued = true;