aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2017-02-19 07:07:59 -0500
committerJiri Kosina <jkosina@suse.cz>2017-03-06 08:16:13 -0500
commitd3d9adfe3059cb5cb330a2da74ea0bad49b482c0 (patch)
tree25bb7dd98943ffcbe96a252149cd26003fdae187
parent572d3c6444979a6a49c6b464110563f578e8dece (diff)
HID: i2c-hid: Fix error handling
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 <christophe.jaillet@wanadoo.fr> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/i2c-hid/i2c-hid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c
index a3f6daf0886b..a83814949467 100644
--- a/drivers/hid/i2c-hid/i2c-hid.c
+++ b/drivers/hid/i2c-hid/i2c-hid.c
@@ -1064,7 +1064,7 @@ static int i2c_hid_probe(struct i2c_client *client,
1064 if (ret != -EPROBE_DEFER) 1064 if (ret != -EPROBE_DEFER)
1065 dev_err(&client->dev, "Failed to get regulator: %d\n", 1065 dev_err(&client->dev, "Failed to get regulator: %d\n",
1066 ret); 1066 ret);
1067 return ret; 1067 goto err;
1068 } 1068 }
1069 1069
1070 ret = regulator_enable(ihid->pdata.supply); 1070 ret = regulator_enable(ihid->pdata.supply);