From: Roderick Colenbrander <roderick.colenbran...@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 <l...@intel.com>
Signed-off-by: Roderick Colenbrander <roderick.colenbran...@sony.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoi...@redhat.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 84f484fce1ee..f279064e74a5 100644
--- a/drivers/hid/hid-playstation.c
+++ b/drivers/hid/hid-playstation.c
@@ -333,7 +333,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;
@@ -358,7 +358,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.29.2

Reply via email to