From 57a241b461ab44410fb256eecf6c0280954c5313 Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Wed, 12 Sep 2012 08:56:04 -0300 Subject: [PATCH] --- yaml --- r: 333823 b: refs/heads/master c: 3f037426d61027d40063a1fc2d00a08154c7c187 h: refs/heads/master i: 333821: c2b71af51147d003623bac0052a0da1ee6ef3e16 333819: 02bfa8d4fc9582122e0207dcbe63658e1e50de45 333815: 51b15645520493e0637ca2879bdca219564daf60 333807: 0914bc781516ea265435645f5fa9eb00ea343451 333791: acb20a316d1c954e7b915fe58ea2339b31adaa11 333759: 676d4256ee2583d7828070dae63a5b6f9d7f682d 333695: 29fe0661a338fe58436b4edd5fe31a9abe311d02 333567: c3ac1f229d6e41722b2c514b9dab4279684ab537 333311: d65f6f00ffaffa9d1fb74b4f64b776254cf68cc3 332799: 839ad0a459b6a3eb8cdbc0b24777253b75715720 331775: 12cfe296e585dd17cf5117c7b3c4f9b6c4881049 v: v3 --- [refs] | 2 +- .../media/dvb-frontends/dvb_dummy_fe.c | 21 ++++++------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 396a5ccc3291..71e0778d9c67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f49908adb1ff4f0cec429923f1f49e79f318812 +refs/heads/master: 3f037426d61027d40063a1fc2d00a08154c7c187 diff --git a/trunk/drivers/media/dvb-frontends/dvb_dummy_fe.c b/trunk/drivers/media/dvb-frontends/dvb_dummy_fe.c index dcfc902c8678..d5acc304786b 100644 --- a/trunk/drivers/media/dvb-frontends/dvb_dummy_fe.c +++ b/trunk/drivers/media/dvb-frontends/dvb_dummy_fe.c @@ -121,16 +121,13 @@ struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void) /* allocate memory for the internal state */ state = kzalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL); - if (state == NULL) goto error; + if (!state) + return NULL; /* create dvb_frontend */ memcpy(&state->frontend.ops, &dvb_dummy_fe_ofdm_ops, sizeof(struct dvb_frontend_ops)); state->frontend.demodulator_priv = state; return &state->frontend; - -error: - kfree(state); - return NULL; } static struct dvb_frontend_ops dvb_dummy_fe_qpsk_ops; @@ -141,16 +138,13 @@ struct dvb_frontend *dvb_dummy_fe_qpsk_attach(void) /* allocate memory for the internal state */ state = kzalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL); - if (state == NULL) goto error; + if (!state) + return NULL; /* create dvb_frontend */ memcpy(&state->frontend.ops, &dvb_dummy_fe_qpsk_ops, sizeof(struct dvb_frontend_ops)); state->frontend.demodulator_priv = state; return &state->frontend; - -error: - kfree(state); - return NULL; } static struct dvb_frontend_ops dvb_dummy_fe_qam_ops; @@ -161,16 +155,13 @@ struct dvb_frontend *dvb_dummy_fe_qam_attach(void) /* allocate memory for the internal state */ state = kzalloc(sizeof(struct dvb_dummy_fe_state), GFP_KERNEL); - if (state == NULL) goto error; + if (!state) + return NULL; /* create dvb_frontend */ memcpy(&state->frontend.ops, &dvb_dummy_fe_qam_ops, sizeof(struct dvb_frontend_ops)); state->frontend.demodulator_priv = state; return &state->frontend; - -error: - kfree(state); - return NULL; } static struct dvb_frontend_ops dvb_dummy_fe_ofdm_ops = {