Re: [PATCH] HID: i2c-hid: Fix error handling
flat view
From: Jiri Kosina <jikos@kernel.org>
Date: 2017-03-06 13:42:10
Also in:
kernel-janitors, lkml
On Sun, 19 Feb 2017, Christophe JAILLET wrote:
quoted hunk ↗ jump to hunk
According to error handling in this function, it is likely that some resources should be freed before returning. Replace 'return ret', with 'goto err'. While at it, remove some spaces at the beginning of the lines to be more consistent. Fixes: ead0687fe304a ("HID: i2c-hid: support regulator power on/off") Signed-off-by: Christophe JAILLET <redacted> --- drivers/hid/i2c-hid/i2c-hid.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index d5288f3fb5ee..1a57ac2d8524 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c@@ -1058,13 +1058,13 @@ static int i2c_hid_probe(struct i2c_client *client, } ihid->pdata.supply = devm_regulator_get(&client->dev, "vdd"); - if (IS_ERR(ihid->pdata.supply)) { - ret = PTR_ERR(ihid->pdata.supply); - if (ret != -EPROBE_DEFER) - dev_err(&client->dev, "Failed to get regulator: %d\n", - ret); - return ret; - } + if (IS_ERR(ihid->pdata.supply)) { + ret = PTR_ERR(ihid->pdata.supply); + if (ret != -EPROBE_DEFER) + dev_err(&client->dev, "Failed to get regulator: %d\n", + ret); + goto err; + }
I don't see any spaces at the beginning of lines in the version that's in my tree ... o_O? Therefore I've converted this patch into simple 'return ret -> goto err' transformation and applied on top for-4.12/i2c-hid. Thanks, -- Jiri Kosina SUSE Labs