Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Two i2c driver bugfixes"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: qup: Fix order of runtime pm initialization
i2c: rk3x: fix 0 length write transfers
+9
-5
+8
-4
drivers/i2c/busses/i2c-qup.c
+8
-4
drivers/i2c/busses/i2c-qup.c
···
674
674
qup->adap.dev.of_node = pdev->dev.of_node;
675
675
strlcpy(qup->adap.name, "QUP I2C adapter", sizeof(qup->adap.name));
676
676
677
-
ret = i2c_add_adapter(&qup->adap);
678
-
if (ret)
679
-
goto fail;
680
-
681
677
pm_runtime_set_autosuspend_delay(qup->dev, MSEC_PER_SEC);
682
678
pm_runtime_use_autosuspend(qup->dev);
683
679
pm_runtime_set_active(qup->dev);
684
680
pm_runtime_enable(qup->dev);
681
+
682
+
ret = i2c_add_adapter(&qup->adap);
683
+
if (ret)
684
+
goto fail_runtime;
685
+
685
686
return 0;
686
687
688
+
fail_runtime:
689
+
pm_runtime_disable(qup->dev);
690
+
pm_runtime_set_suspended(qup->dev);
687
691
fail:
688
692
qup_i2c_disable_clocks(qup);
689
693
return ret;