Merge branch 'perf/urgent' into perf/core

[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb-frontends / s5h1432.c

diff --git a/drivers/media/dvb-frontends/s5h1432.c b/drivers/media/dvb-frontends/s5h1432.c
index 8352ce1c95563798c06f86e4b0f68bec85c6cd7f..6ec16a24374172f9eb3052e9b1c27e6463be95bb 100644 (file)
--- a/drivers/media/dvb-frontends/s5h1432.c
+++ b/drivers/media/dvb-frontends/s5h1432.c
@@ -351,8 +351,8 @@ struct dvb_frontend *s5h1432_attach(const struct s5h1432_config *config,
        printk(KERN_INFO " Enter s5h1432_attach(). attach success!\n");
        /* allocate memory for the internal state */
        state = kmalloc(sizeof(struct s5h1432_state), GFP_KERNEL);
-       if (state == NULL)
-               goto error;
+       if (!state)
+               return NULL;
 
        /* setup the state */
        state->config = config;
@@ -367,10 +367,6 @@ struct dvb_frontend *s5h1432_attach(const struct s5h1432_config *config,
        state->frontend.demodulator_priv = state;
 
        return &state->frontend;
-
-error:
-       kfree(state);
-       return NULL;
 }
 EXPORT_SYMBOL(s5h1432_attach);