Re: [PATCH] platform: x86: huawei-wmi: check the return value of device_create_file()

[Jia-Ju Bai <baijiaju1990@gmail.com>]

Hi Hans,

Thanks for the advice!
I will send a V2 patch.


Best wishes,
Jia-Ju Bai


On 2022/3/2 22:31, Hans de Goede wrote:
> Hi,
>
> On 2/25/22 14:04, Jia-Ju Bai wrote:
>> The function device_create_file() in huawei_wmi_battery_add() can fail,
>> so its return value should be checked.
>>
>> Fixes: 355a070b09ab ("platform/x86: huawei-wmi: Add battery charging thresholds")
>> Reported-by: TOTE Robot <oslab@tsinghua.edu.cn>
>> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
> Please run check-patch.pl your patches before submitting them.
>
>
>> ---
>>   drivers/platform/x86/huawei-wmi.c | 15 ++++++++++++---
>>   1 file changed, 12 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/platform/x86/huawei-wmi.c b/drivers/platform/x86/huawei-wmi.c
>> index a2d846c4a7ee..2ffd3840f3e8 100644
>> --- a/drivers/platform/x86/huawei-wmi.c
>> +++ b/drivers/platform/x86/huawei-wmi.c
>> @@ -470,10 +470,19 @@ static DEVICE_ATTR_RW(charge_control_thresholds);
>>   
>>   static int huawei_wmi_battery_add(struct power_supply *battery)
>>   {
>> -	device_create_file(&battery->dev, &dev_attr_charge_control_start_threshold);
>> -	device_create_file(&battery->dev, &dev_attr_charge_control_end_threshold);
>> +	int err = 0;
> There needs to be an empty line here,
>> +	err = device_create_file(&battery->dev,
>> +						&dev_attr_charge_control_start_threshold);
> Why the weird continuation of the call on another line? Please make this a single line.
>
>> +	if (err)
>> +		return err;
> Empty line here.
>
>> +	err = device_create_file(&battery->dev,
>> +						&dev_attr_charge_control_end_threshold);
> Please make this a single line.
>
>> +	if (err) {
>> +		device_remove_file(&battery->dev,
>> +						&dev_attr_charge_control_start_threshold);
>> +	}
> No need for {} here.
>
>>   
>> -	return 0;
>> +	return err;
>>   }
>>   
>>   static int huawei_wmi_battery_remove(struct power_supply *battery)
> Regards,
>
> Hans
>