Skip to content

Commit

Permalink
V4L/DVB: dvb/stv6110x: cleanup error handling
Browse files Browse the repository at this point in the history
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: Dan Carpenter <error27@gmail.com>
Reviewed-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Dan Carpenter authored and Mauro Carvalho Chehab committed May 19, 2010
1 parent 1a2f717 commit 83b6601
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions drivers/media/dvb/frontends/stv6110x.c
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,8 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
u8 default_regs[] = {0x07, 0x11, 0xdc, 0x85, 0x17, 0x01, 0xe6, 0x1e};

stv6110x = kzalloc(sizeof (struct stv6110x_state), GFP_KERNEL);
if (stv6110x == NULL)
goto error;
if (!stv6110x)
return NULL;

stv6110x->i2c = i2c;
stv6110x->config = config;
Expand Down Expand Up @@ -392,12 +392,8 @@ struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
fe->tuner_priv = stv6110x;
fe->ops.tuner_ops = stv6110x_ops;

printk("%s: Attaching STV6110x \n", __func__);
printk(KERN_INFO "%s: Attaching STV6110x\n", __func__);
return stv6110x->devctl;

error:
kfree(stv6110x);
return NULL;
}
EXPORT_SYMBOL(stv6110x_attach);

Expand Down

0 comments on commit 83b6601

Please sign in to comment.