From: Christian Marangi Date: Sat, 6 May 2023 20:40:39 +0000 (+0200) Subject: ramips: 5.15: handle return from device_reset in I2C driver X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b786d744effff777ffa1fd478718ab9a7ab8a2e7;p=openwrt%2Fstaging%2Fthess.git ramips: 5.15: handle return from device_reset in I2C driver Handle return from device reset in I2C driver. Don't fail on device_reset error but print a warning. Fix compilation warning: sound/soc/ralink/ralink-i2s.c: In function 'ralink_i2s_probe': sound/soc/ralink/ralink-i2s.c:885:9: error: ignoring return value of 'device_reset' declared with attribute 'warn_unused_result' [-Werror=unused-result] 885 | device_reset(&pdev->dev); | ^~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Signed-off-by: Christian Marangi --- diff --git a/target/linux/ramips/patches-5.15/825-i2c-MIPS-adds-ralink-I2C-driver.patch b/target/linux/ramips/patches-5.15/825-i2c-MIPS-adds-ralink-I2C-driver.patch index 5a4491c95a..da6f8e5a1e 100644 --- a/target/linux/ramips/patches-5.15/825-i2c-MIPS-adds-ralink-I2C-driver.patch +++ b/target/linux/ramips/patches-5.15/825-i2c-MIPS-adds-ralink-I2C-driver.patch @@ -69,7 +69,7 @@ Signed-off-by: John Crispin obj-$(CONFIG_I2C_QUP) += i2c-qup.o --- /dev/null +++ b/drivers/i2c/busses/i2c-ralink.c -@@ -0,0 +1,435 @@ +@@ -0,0 +1,440 @@ +/* + * drivers/i2c/busses/i2c-ralink.c + * @@ -245,7 +245,12 @@ Signed-off-by: John Crispin + +static void rt_i2c_reset(struct rt_i2c *i2c) +{ -+ device_reset(i2c->adap.dev.parent); ++ int ret; ++ ++ ret = device_reset(i2c->adap.dev.parent); ++ if (ret) ++ dev_err(i2c->dev, "Failed to reset device"); ++ + barrier(); + rt_i2c_w32(i2c, i2c->clk_div, REG_CLKDIV_REG); +}