Commit 83b6601c authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab

V4L/DVB: dvb/stv6110x: cleanup error handling

The "stv6110x" is NULL so we can just return directly without calling
kfree().  Also I changed the printk() to make checkpatch.pl happy.
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Reviewed-by: default avatarManu Abraham <manu@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1a2f7178
...@@ -363,8 +363,8 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe, ...@@ -363,8 +363,8 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
u8 default_regs[] = {0x07, 0x11, 0xdc, 0x85, 0x17, 0x01, 0xe6, 0x1e}; u8 default_regs[] = {0x07, 0x11, 0xdc, 0x85, 0x17, 0x01, 0xe6, 0x1e};
stv6110x = kzalloc(sizeof (struct stv6110x_state), GFP_KERNEL); stv6110x = kzalloc(sizeof (struct stv6110x_state), GFP_KERNEL);
if (stv6110x == NULL) if (!stv6110x)
goto error; return NULL;
stv6110x->i2c = i2c; stv6110x->i2c = i2c;
stv6110x->config = config; stv6110x->config = config;
...@@ -392,12 +392,8 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe, ...@@ -392,12 +392,8 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
fe->tuner_priv = stv6110x; fe->tuner_priv = stv6110x;
fe->ops.tuner_ops = stv6110x_ops; fe->ops.tuner_ops = stv6110x_ops;
printk("%s: Attaching STV6110x \n", __func__); printk(KERN_INFO "%s: Attaching STV6110x\n", __func__);
return stv6110x->devctl; return stv6110x->devctl;
error:
kfree(stv6110x);
return NULL;
} }
EXPORT_SYMBOL(stv6110x_attach); EXPORT_SYMBOL(stv6110x_attach);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment