Commit 1ad77a05 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 51595e3b 0d95f41e

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

+1 −1
Original line number Diff line number Diff line
@@ -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>;

drivers/i3c/master.c

+1 −4
Original line number Diff line number Diff line
@@ -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 @@ int i3c_master_register(struct i3c_master_controller *master, 
err_cleanup_bus:

	i3c_master_bus_cleanup(master);



err_destroy_wq:

	destroy_workqueue(master->wq);



err_put_dev:

	put_device(&master->dev);

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

+0 −1
Original line number Diff line number Diff line
@@ -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;