HID: playstation: fix unused variable in ps_battery_get_property.

Roderick Colenbrander · bentiss · commit 5fb52551248f · 2021-02-17T18:34:55.000+01:00
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 &lt;lkp@intel.com&gt;
Signed-off-by: Roderick Colenbrander &lt;roderick.colenbrander@sony.com&gt;
Signed-off-by: Benjamin Tissoires &lt;benjamin.tissoires@redhat.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ static int ps_battery_get_property(struct power_supply *psy,`
`333`	`333`	`uint8_t battery_capacity;`
`334`	`334`	`int battery_status;`
`335`	`335`	`unsigned long flags;`
`336`		`- int ret;`
	`336`	`+ int ret = 0;`
`337`	`337`
`338`	`338`	`spin_lock_irqsave(&dev->lock, flags);`
`339`	`339`	`battery_capacity = dev->battery_capacity;`
`@@ -358,7 +358,7 @@ static int ps_battery_get_property(struct power_supply *psy,`
`358`	`358`	`break;`
`359`	`359`	`}`
`360`	`360`
`361`		`- return 0;`
	`361`	`+ return ret;`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`static int ps_device_register_battery(struct ps_device *dev)`