Skip to content

Commit 1ad77a0

Browse files
committed
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
2 parents 51595e3 + 0d95f41 commit 1ad77a0

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ additionalProperties: true
4949
examples:
5050
- |
5151
i3c-master@a0000000 {
52-
compatible = "silvaco,i3c-master";
52+
compatible = "silvaco,i3c-master-v1";
5353
clocks = <&zynqmp_clk 71>, <&fclk>, <&sclk>;
5454
clock-names = "pclk", "fast_clk", "slow_clk";
5555
interrupt-parent = <&gic>;

drivers/i3c/master.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2535,7 +2535,7 @@ int i3c_master_register(struct i3c_master_controller *master,
25352535

25362536
ret = i3c_master_bus_init(master);
25372537
if (ret)
2538-
goto err_destroy_wq;
2538+
goto err_put_dev;
25392539

25402540
ret = device_add(&master->dev);
25412541
if (ret)
@@ -2566,9 +2566,6 @@ int i3c_master_register(struct i3c_master_controller *master,
25662566
err_cleanup_bus:
25672567
i3c_master_bus_cleanup(master);
25682568

2569-
err_destroy_wq:
2570-
destroy_workqueue(master->wq);
2571-
25722569
err_put_dev:
25732570
put_device(&master->dev);
25742571

drivers/i3c/master/svc-i3c-master.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1124,7 +1124,6 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master,
11241124
cmd->in = NULL;
11251125
cmd->out = &ccc->id;
11261126
cmd->len = 1;
1127-
cmd->read_len = xfer_len;
11281127
cmd->read_len = 0;
11291128
cmd->continued = true;
11301129

0 commit comments

Comments
 (0)