niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

V4L/DVB (7051): Cleans up error handling on or51xxx_attach

Browse source 
state is already NULL.

Reviewed-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mauro Carvalho Chehab 2008-01-07 10:45:47 -03:00
parent 4e8a23ea3c
commit 3473e342d7
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/media/dvb/frontends/or51132.c
View file

@ -564,7 +564,7 @@ struct dvb_frontend* or51132_attach(const struct or51132_config* config,
/* Allocate memory for the internal state */ /* Allocate memory for the internal state */
state = kmalloc(sizeof(struct or51132_state), GFP_KERNEL); state = kmalloc(sizeof(struct or51132_state), GFP_KERNEL);
if (state == NULL) if (state == NULL)
goto error; return NULL;
/* Setup the state */ /* Setup the state */
state->config = config; 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)); memcpy(&state->frontend.ops, &or51132_ops, sizeof(struct dvb_frontend_ops));
state->frontend.demodulator_priv = state; state->frontend.demodulator_priv = state;
return &state->frontend; return &state->frontend;
error:
kfree(state);
return NULL;
} }
static struct dvb_frontend_ops or51132_ops = { static struct dvb_frontend_ops or51132_ops = {

6
drivers/media/dvb/frontends/or51211.c
View file

@ -529,7 +529,7 @@ struct dvb_frontend* or51211_attach(const struct or51211_config* config,
/* Allocate memory for the internal state */ /* Allocate memory for the internal state */
state = kmalloc(sizeof(struct or51211_state), GFP_KERNEL); state = kmalloc(sizeof(struct or51211_state), GFP_KERNEL);
if (state == NULL) if (state == NULL)
goto error; return NULL;
/* Setup the state */ /* Setup the state */
state->config = config; state->config = config;
@ -541,10 +541,6 @@ struct dvb_frontend* or51211_attach(const struct or51211_config* config,
memcpy(&state->frontend.ops, &or51211_ops, sizeof(struct dvb_frontend_ops)); memcpy(&state->frontend.ops, &or51211_ops, sizeof(struct dvb_frontend_ops));
state->frontend.demodulator_priv = state; state->frontend.demodulator_priv = state;
return &state->frontend; return &state->frontend;
error:
kfree(state);
return NULL;
} }
static struct dvb_frontend_ops or51211_ops = { static struct dvb_frontend_ops or51211_ops = {