FAILED: patch "[PATCH] Input: raydium_i2c_ts - fix error codes in" failed to apply to 4.14-stable tree

FAILED: patch "[PATCH] Input: raydium_i2c_ts - fix error codes in" failed to apply to 4.14-stable tree

[gregkh]

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 32cf3a610c35cb21e3157f4bbf29d89960e30a36 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 6 Mar 2020 11:50:51 -0800
Subject: [PATCH] Input: raydium_i2c_ts - fix error codes in
 raydium_i2c_boot_trigger()

These functions are supposed to return negative error codes but instead
it returns true on failure and false on success.  The error codes are
eventually propagated back to user space.

Fixes: 48a2b783483b ("Input: add Raydium I2C touchscreen driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20200303101306.4potflz7na2nn3od@kili.mountain
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/touchscreen/raydium_i2c_ts.c b/drivers/input/touchscreen/raydium_i2c_ts.c
index 6ed9f22e6401..fe245439adee 100644
--- a/drivers/input/touchscreen/raydium_i2c_ts.c
+++ b/drivers/input/touchscreen/raydium_i2c_ts.c
@@ -432,7 +432,7 @@ static int raydium_i2c_write_object(struct i2c_client *client,
 	return 0;
 }
 
-static bool raydium_i2c_boot_trigger(struct i2c_client *client)
+static int raydium_i2c_boot_trigger(struct i2c_client *client)
 {
 	static const u8 cmd[7][6] = {
 		{ 0x08, 0x0C, 0x09, 0x00, 0x50, 0xD7 },
@@ -457,10 +457,10 @@ static bool raydium_i2c_boot_trigger(struct i2c_client *client)
 		}
 	}
 
-	return false;
+	return 0;
 }
 
-static bool raydium_i2c_fw_trigger(struct i2c_client *client)
+static int raydium_i2c_fw_trigger(struct i2c_client *client)
 {
 	static const u8 cmd[5][11] = {
 		{ 0, 0x09, 0x71, 0x0C, 0x09, 0x00, 0x50, 0xD7, 0, 0, 0 },
@@ -483,7 +483,7 @@ static bool raydium_i2c_fw_trigger(struct i2c_client *client)
 		}
 	}
 
-	return false;
+	return 0;
 }
 
 static int raydium_i2c_check_path(struct i2c_client *client)

Re: FAILED: patch "[PATCH] Input: raydium_i2c_ts - fix error codes in" failed to apply to 4.14-stable tree

[Sasha Levin]

On Mon, Mar 30, 2020 at 11:49:05AM +0200, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.14-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From 32cf3a610c35cb21e3157f4bbf29d89960e30a36 Mon Sep 17 00:00:00 2001
>From: Dan Carpenter <dan.carpenter@oracle.com>
>Date: Fri, 6 Mar 2020 11:50:51 -0800
>Subject: [PATCH] Input: raydium_i2c_ts - fix error codes in
> raydium_i2c_boot_trigger()
>
>These functions are supposed to return negative error codes but instead
>it returns true on failure and false on success.  The error codes are
>eventually propagated back to user space.
>
>Fixes: 48a2b783483b ("Input: add Raydium I2C touchscreen driver")
>Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>Link: https://lore.kernel.org/r/20200303101306.4potflz7na2nn3od@kili.mountain
>Cc: stable@vger.kernel.org
>Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

I also took 6cad4e269e25 ("Input: raydium_i2c_ts - use true and false
for boolean values") to work around this conflict. Queued both for 4.14
and 4.9.

-- 
Thanks,
Sasha

Re: FAILED: patch "[PATCH] Input: raydium_i2c_ts - fix error codes in" failed to apply to 4.14-stable tree

[Greg KH]

On Mon, Mar 30, 2020 at 08:48:26AM -0400, Sasha Levin wrote:
> On Mon, Mar 30, 2020 at 11:49:05AM +0200, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 4.14-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
> > 
> > thanks,
> > 
> > greg k-h
> > 
> > ------------------ original commit in Linus's tree ------------------
> > 
> > > From 32cf3a610c35cb21e3157f4bbf29d89960e30a36 Mon Sep 17 00:00:00 2001
> > From: Dan Carpenter <dan.carpenter@oracle.com>
> > Date: Fri, 6 Mar 2020 11:50:51 -0800
> > Subject: [PATCH] Input: raydium_i2c_ts - fix error codes in
> > raydium_i2c_boot_trigger()
> > 
> > These functions are supposed to return negative error codes but instead
> > it returns true on failure and false on success.  The error codes are
> > eventually propagated back to user space.
> > 
> > Fixes: 48a2b783483b ("Input: add Raydium I2C touchscreen driver")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > Link: https://lore.kernel.org/r/20200303101306.4potflz7na2nn3od@kili.mountain
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> 
> I also took 6cad4e269e25 ("Input: raydium_i2c_ts - use true and false
> for boolean values") to work around this conflict. Queued both for 4.14
> and 4.9.

Thanks!