diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-07 08:45:47 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:05:09 -0500 |
commit | 3473e342d79be938497a31caedd3c4e8d562485f (patch) | |
tree | 54f08dcac638dcd98bfa3efa5fcd727967330cee /drivers/media/dvb/frontends/or51132.c | |
parent | 4e8a23ea3c1333561f8d0f5daee53feee3e85b8a (diff) |
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.c | 6 |
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, | |||
564 | /* Allocate memory for the internal state */ | 564 | /* Allocate memory for the internal state */ |
565 | state = kmalloc(sizeof(struct or51132_state), GFP_KERNEL); | 565 | state = kmalloc(sizeof(struct or51132_state), GFP_KERNEL); |
566 | if (state == NULL) | 566 | if (state == NULL) |
567 | goto error; | 567 | return NULL; |
568 | 568 | ||
569 | /* Setup the state */ | 569 | /* Setup the state */ |
570 | state->config = config; | 570 | state->config = config; |
@@ -576,10 +576,6 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config, | |||
576 | memcpy(&state->frontend.ops, &or51132_ops, sizeof(struct dvb_frontend_ops)); | 576 | memcpy(&state->frontend.ops, &or51132_ops, sizeof(struct dvb_frontend_ops)); |
577 | state->frontend.demodulator_priv = state; | 577 | state->frontend.demodulator_priv = state; |
578 | return &state->frontend; | 578 | return &state->frontend; |
579 | |||
580 | error: | ||
581 | kfree(state); | ||
582 | return NULL; | ||
583 | } | 579 | } |
584 | 580 | ||
585 | static struct dvb_frontend_ops or51132_ops = { | 581 | static struct dvb_frontend_ops or51132_ops = { |