kernel: bump 5.15 to 5.15.140

[openwrt/staging/hauke.git] / target / linux / mediatek / patches-5.15 / 850-v6.0-i2c-move-drivers-from-strlcpy-to-strscpy.patch

diff --git a/target/linux/mediatek/patches-5.15/850-v6.0-i2c-move-drivers-from-strlcpy-to-strscpy.patch b/target/linux/mediatek/patches-5.15/850-v6.0-i2c-move-drivers-from-strlcpy-to-strscpy.patch
index 0d9fa0550b23d18ee9fb9a6550aa80fdf9eab7c8..69f2d2a545dcf470c10766dda0906ed4173be3a6 100644 (file)
--- a/target/linux/mediatek/patches-5.15/850-v6.0-i2c-move-drivers-from-strlcpy-to-strscpy.patch
+++ b/target/linux/mediatek/patches-5.15/850-v6.0-i2c-move-drivers-from-strlcpy-to-strscpy.patch
@@ -237,7 +237,7 @@ Signed-off-by: Wolfram Sang <wsa@kernel.org>
        priv->adap.algo = &hix5hd2_i2c_algorithm;
 --- a/drivers/i2c/busses/i2c-i801.c
 +++ b/drivers/i2c/busses/i2c-i801.c
-@@ -1111,7 +1111,7 @@ static void dmi_check_onboard_device(u8
+@@ -1110,7 +1110,7 @@ static void dmi_check_onboard_device(u8
  
                memset(&info, 0, sizeof(struct i2c_board_info));
                info.addr = dmi_devices[i].i2c_addr;
@@ -246,7 +246,7 @@ Signed-off-by: Wolfram Sang <wsa@kernel.org>
                i2c_new_client_device(adap, &info);
                break;
        }
-@@ -1267,7 +1267,7 @@ static void register_dell_lis3lv02d_i2c_
+@@ -1266,7 +1266,7 @@ static void register_dell_lis3lv02d_i2c_
  
        memset(&info, 0, sizeof(struct i2c_board_info));
        info.addr = dell_lis3lv02d_devices[i].i2c_addr;
@@ -403,7 +403,7 @@ Signed-off-by: Wolfram Sang <wsa@kernel.org>
        /* Slow down if we can't sense SCL */
 --- a/drivers/i2c/busses/i2c-pxa.c
 +++ b/drivers/i2c/busses/i2c-pxa.c
-@@ -1403,7 +1403,7 @@ static int i2c_pxa_probe(struct platform
+@@ -1463,7 +1463,7 @@ static int i2c_pxa_probe(struct platform
        spin_lock_init(&i2c->lock);
        init_waitqueue_head(&i2c->wait);