* [PATCH] HID: playstation: fix unused variable in ps_battery_get_property.
@ 2021-02-12 6:41 Roderick Colenbrander
2021-02-12 9:06 ` Benjamin Tissoires
0 siblings, 1 reply; 2+ messages in thread
From: Roderick Colenbrander @ 2021-02-12 6:41 UTC (permalink / raw)
To: Jiri Kosina, Benjamin Tissoires
Cc: linux-input, Roderick Colenbrander, kernel test robot
From: Roderick Colenbrander <roderick.colenbrander@sony.com>
The ret variable in ps_battery_get_property is set in an error path,
but never actually returned. Change the function to return ret.
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com>
---
drivers/hid/hid-playstation.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
index cc93c16cc822..408b651174cf 100644
--- a/drivers/hid/hid-playstation.c
+++ b/drivers/hid/hid-playstation.c
@@ -391,7 +391,7 @@ static int ps_battery_get_property(struct power_supply *psy,
uint8_t battery_capacity;
int battery_status;
unsigned long flags;
- int ret;
+ int ret = 0;
spin_lock_irqsave(&dev->lock, flags);
battery_capacity = dev->battery_capacity;
@@ -416,7 +416,7 @@ static int ps_battery_get_property(struct power_supply *psy,
break;
}
- return 0;
+ return ret;
}
static int ps_device_register_battery(struct ps_device *dev)
--
2.26.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] HID: playstation: fix unused variable in ps_battery_get_property.
2021-02-12 6:41 [PATCH] HID: playstation: fix unused variable in ps_battery_get_property Roderick Colenbrander
@ 2021-02-12 9:06 ` Benjamin Tissoires
0 siblings, 0 replies; 2+ messages in thread
From: Benjamin Tissoires @ 2021-02-12 9:06 UTC (permalink / raw)
To: Roderick Colenbrander
Cc: Jiri Kosina, open list:HID CORE LAYER, Roderick Colenbrander,
kernel test robot
On Fri, Feb 12, 2021 at 7:41 AM Roderick Colenbrander
<roderick@gaikai.com> wrote:
>
> From: Roderick Colenbrander <roderick.colenbrander@sony.com>
>
> The ret variable in ps_battery_get_property is set in an error path,
> but never actually returned. Change the function to return ret.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com>
> ---
Applied, thanks for the quick fix.
Cheers,
Benjamin
> drivers/hid/hid-playstation.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
> index cc93c16cc822..408b651174cf 100644
> --- a/drivers/hid/hid-playstation.c
> +++ b/drivers/hid/hid-playstation.c
> @@ -391,7 +391,7 @@ static int ps_battery_get_property(struct power_supply *psy,
> uint8_t battery_capacity;
> int battery_status;
> unsigned long flags;
> - int ret;
> + int ret = 0;
>
> spin_lock_irqsave(&dev->lock, flags);
> battery_capacity = dev->battery_capacity;
> @@ -416,7 +416,7 @@ static int ps_battery_get_property(struct power_supply *psy,
> break;
> }
>
> - return 0;
> + return ret;
> }
>
> static int ps_device_register_battery(struct ps_device *dev)
> --
> 2.26.2
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-12 9:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-12 6:41 [PATCH] HID: playstation: fix unused variable in ps_battery_get_property Roderick Colenbrander
2021-02-12 9:06 ` Benjamin Tissoires
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.