[PATCH AUTOSEL 4.20 148/304] Input: rotary-encoder - don't log EPROBE_DEFER to kernel log

[PATCH AUTOSEL 4.20 148/304] Input: rotary-encoder - don't log EPROBE_DEFER to kernel log

[Sasha Levin]

From: Uwe Kleine-König <uwe@kleine-koenig.org>

[ Upstream commit 0832e93632c61987d504e251b927a2be769dd21a ]

When a driver fails to bind because a resource it still missing it's not
helpful to report this as (usually) probing is repeated later.

Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/input/misc/rotary_encoder.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index 30ec77ad32c6..d748897bf5e9 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -240,8 +240,10 @@ static int rotary_encoder_probe(struct platform_device *pdev)
 
 	encoder->gpios = devm_gpiod_get_array(dev, NULL, GPIOD_IN);
 	if (IS_ERR(encoder->gpios)) {
-		dev_err(dev, "unable to get gpios\n");
-		return PTR_ERR(encoder->gpios);
+		err = PTR_ERR(encoder->gpios);
+		if (err != -EPROBE_DEFER)
+			dev_err(dev, "unable to get gpios: %d\n", err);
+		return err;
 	}
 	if (encoder->gpios->ndescs < 2) {
 		dev_err(dev, "not enough gpios found\n");
-- 
2.19.1

[PATCH AUTOSEL 4.20 294/304] HID: lenovo: Add checks to fix of_led_classdev_register

[Sasha Levin]

From: Aditya Pakki <pakki001@umn.edu>

[ Upstream commit 6ae16dfb61bce538d48b7fe98160fada446056c5 ]

In lenovo_probe_tpkbd(), the function of_led_classdev_register() could
return an error value that is unchecked. The fix adds these checks.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/hid/hid-lenovo.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c
index 643b6eb54442..eacc76d2ab96 100644
--- a/drivers/hid/hid-lenovo.c
+++ b/drivers/hid/hid-lenovo.c
@@ -743,7 +743,9 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev)
 	data_pointer->led_mute.brightness_get = lenovo_led_brightness_get_tpkbd;
 	data_pointer->led_mute.brightness_set = lenovo_led_brightness_set_tpkbd;
 	data_pointer->led_mute.dev = dev;
-	led_classdev_register(dev, &data_pointer->led_mute);
+	ret = led_classdev_register(dev, &data_pointer->led_mute);
+	if (ret < 0)
+		goto err;
 
 	data_pointer->led_micmute.name = name_micmute;
 	data_pointer->led_micmute.brightness_get =
@@ -751,7 +753,11 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev)
 	data_pointer->led_micmute.brightness_set =
 		lenovo_led_brightness_set_tpkbd;
 	data_pointer->led_micmute.dev = dev;
-	led_classdev_register(dev, &data_pointer->led_micmute);
+	ret = led_classdev_register(dev, &data_pointer->led_micmute);
+	if (ret < 0) {
+		led_classdev_unregister(&data_pointer->led_mute);
+		goto err;
+	}
 
 	lenovo_features_set_tpkbd(hdev);
 
-- 
2.19.1

Re: [PATCH AUTOSEL 4.20 148/304] Input: rotary-encoder - don't log EPROBE_DEFER to kernel log

[Dmitry Torokhov]

Hi Sasha,

On Mon, Jan 28, 2019 at 10:41:05AM -0500, Sasha Levin wrote:
> From: Uwe Kleine-König <uwe@kleine-koenig.org>
> 
> [ Upstream commit 0832e93632c61987d504e251b927a2be769dd21a ]
> 
> When a driver fails to bind because a resource it still missing it's not
> helpful to report this as (usually) probing is repeated later.

I do not think that patch that merely suppresses a harmless warning in
dmesg belongs in stable.

> 
> Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
>  drivers/input/misc/rotary_encoder.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
> index 30ec77ad32c6..d748897bf5e9 100644
> --- a/drivers/input/misc/rotary_encoder.c
> +++ b/drivers/input/misc/rotary_encoder.c
> @@ -240,8 +240,10 @@ static int rotary_encoder_probe(struct platform_device *pdev)
>  
>  	encoder->gpios = devm_gpiod_get_array(dev, NULL, GPIOD_IN);
>  	if (IS_ERR(encoder->gpios)) {
> -		dev_err(dev, "unable to get gpios\n");
> -		return PTR_ERR(encoder->gpios);
> +		err = PTR_ERR(encoder->gpios);
> +		if (err != -EPROBE_DEFER)
> +			dev_err(dev, "unable to get gpios: %d\n", err);
> +		return err;
>  	}
>  	if (encoder->gpios->ndescs < 2) {
>  		dev_err(dev, "not enough gpios found\n");
> -- 
> 2.19.1
> 

Thanks.

-- 
Dmitry

Re: [PATCH AUTOSEL 4.20 148/304] Input: rotary-encoder - don't log EPROBE_DEFER to kernel log

[Sasha Levin]

On Mon, Jan 28, 2019 at 10:24:05AM -0800, Dmitry Torokhov wrote:
>Hi Sasha,
>
>On Mon, Jan 28, 2019 at 10:41:05AM -0500, Sasha Levin wrote:
>> From: Uwe Kleine-König <uwe@kleine-koenig.org>
>>
>> [ Upstream commit 0832e93632c61987d504e251b927a2be769dd21a ]
>>
>> When a driver fails to bind because a resource it still missing it's not
>> helpful to report this as (usually) probing is repeated later.
>
>I do not think that patch that merely suppresses a harmless warning in
>dmesg belongs in stable.

I'll drop it.

FWIW, my experience with users is that unexplained warnings in dmesg
sometimes end up being even more trouble than an actual bug :)

--
Thanks,
Sasha