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:
@@ -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>;
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user