HID: sony: fix incorrect force-feedback check in sony_suspend()

[PATCH] HID: sony: fix incorrect force-feedback check in sony_suspend()

Posted by Rosalie Wanders 2 months, 1 week ago

This commit fixes the incorrect force-feedback check in sony_suspend(),
without this the check will always be true due to checking a constant
define that is never 0.

Signed-off-by: Rosalie Wanders <rosalie@mailbox.org>
---
 drivers/hid/hid-sony.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 83e82a0a3327..9cfea6f40ec2 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -2456,11 +2456,10 @@ static void sony_remove(struct hid_device *hdev)
 static int sony_suspend(struct hid_device *hdev, pm_message_t message)
 {
 #ifdef CONFIG_SONY_FF
+	struct sony_sc *sc = hid_get_drvdata(hdev);
 
 	/* On suspend stop any running force-feedback events */
-	if (SONY_FF_SUPPORT) {
-		struct sony_sc *sc = hid_get_drvdata(hdev);
-
+	if (sc->quirks & SONY_FF_SUPPORT) {
 		sc->left = sc->right = 0;
 		sony_send_output_report(sc);
 	}
-- 
2.53.0

Re: [PATCH] HID: sony: fix incorrect force-feedback check in sony_suspend()

Posted by Jiri Kosina 1 month, 3 weeks ago

On Fri, 10 Apr 2026, Rosalie Wanders wrote:

> This commit fixes the incorrect force-feedback check in sony_suspend(),
> without this the check will always be true due to checking a constant
> define that is never 0.
> 
> Signed-off-by: Rosalie Wanders <rosalie@mailbox.org>
> ---
>  drivers/hid/hid-sony.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
> index 83e82a0a3327..9cfea6f40ec2 100644
> --- a/drivers/hid/hid-sony.c
> +++ b/drivers/hid/hid-sony.c
> @@ -2456,11 +2456,10 @@ static void sony_remove(struct hid_device *hdev)
>  static int sony_suspend(struct hid_device *hdev, pm_message_t message)
>  {
>  #ifdef CONFIG_SONY_FF
> +	struct sony_sc *sc = hid_get_drvdata(hdev);
>  
>  	/* On suspend stop any running force-feedback events */
> -	if (SONY_FF_SUPPORT) {
> -		struct sony_sc *sc = hid_get_drvdata(hdev);
> -
> +	if (sc->quirks & SONY_FF_SUPPORT) {
>  		sc->left = sc->right = 0;
>  		sony_send_output_report(sc);

Applied, thanks.

-- 
Jiri Kosina
SUSE Labs