summaryrefslogtreecommitdiff
path: root/drivers/media/dvb/frontends/or51132.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-01-07 10:45:47 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 19:05:09 -0200
commit3473e342d79be938497a31caedd3c4e8d562485f (patch)
tree54f08dcac638dcd98bfa3efa5fcd727967330cee /drivers/media/dvb/frontends/or51132.c
parent4e8a23ea3c1333561f8d0f5daee53feee3e85b8a (diff)
downloadlinux-next-3473e342d79be938497a31caedd3c4e8d562485f.tar.gz
V4L/DVB (7051): Cleans up error handling on or51xxx_attach
state is already NULL. Reviewed-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/frontends/or51132.c')
-rw-r--r--drivers/media/dvb/frontends/or51132.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index b314a1f2deed..1d2d28ce823d 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -564,7 +564,7 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config,
/* Allocate memory for the internal state */
state = kmalloc(sizeof(struct or51132_state), GFP_KERNEL);
if (state == NULL)
- goto error;
+ return NULL;
/* Setup the state */
state->config = config;
@@ -576,10 +576,6 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config,
memcpy(&state->frontend.ops, &or51132_ops, sizeof(struct dvb_frontend_ops));
state->frontend.demodulator_priv = state;
return &state->frontend;
-
-error:
- kfree(state);
- return NULL;
}
static struct dvb_frontend_ops or51132_ops = {