aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-12-16 13:49:07 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-01-27 10:15:58 -0200
commit7657e0647c47393bc61b4e398b4d791350820bd1 (patch)
tree535e9f006eccb52fc17b199ebc7c1279b3dcca64
parent88ca3af44beb281979e3f037d167cc3fec68c9de (diff)
[media] adv7180: Remove the unneeded 'err' label
There is no need to jump to the 'err' label as we can simply return the error code directly and make the code shorter. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/i2c/adv7180.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index bffe6eb528a3..94a3341b091b 100644
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -616,10 +616,8 @@ static int adv7180_probe(struct i2c_client *client,
client->addr, client->adapter->name);
state = devm_kzalloc(&client->dev, sizeof(*state), GFP_KERNEL);
- if (state == NULL) {
- ret = -ENOMEM;
- goto err;
- }
+ if (state == NULL)
+ return -ENOMEM;
state->irq = client->irq;
mutex_init(&state->mutex);
@@ -649,7 +647,6 @@ err_free_ctrl:
adv7180_exit_controls(state);
err_unreg_subdev:
mutex_destroy(&state->mutex);
-err:
return ret;
}

Privacy Policy