1 files changed, 6 insertions, 15 deletions

diff --git a/drivers/media/dvb-frontends/dvb_dummy_fe.c b/drivers/media/dvb-frontends/dvb_dummy_fe.c
index dcfc902c8678..d5acc304786b 100644
--- a/drivers/media/dvb-frontends/dvb_dummy_fe.c
+++ b/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 = {