Merge tag 'tty-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

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

diff --git a/drivers/media/dvb-frontends/lg2160.c b/drivers/media/dvb-frontends/lg2160.c
index cc11260e99df96f7ce19837e6ba268811aa825cf..5fd14f840ab0ffcd38cc32656a24fae3684c62c0 100644 (file)
--- a/drivers/media/dvb-frontends/lg2160.c
+++ b/drivers/media/dvb-frontends/lg2160.c
@@ -1421,8 +1421,8 @@ struct dvb_frontend *lg2160_attach(const struct lg2160_config *config,
               config ? config->i2c_addr : 0);
 
        state = kzalloc(sizeof(struct lg216x_state), GFP_KERNEL);
-       if (state == NULL)
-               goto fail;
+       if (!state)
+               return NULL;
 
        state->cfg = config;
        state->i2c_adap = i2c_adap;
@@ -1449,10 +1449,6 @@ struct dvb_frontend *lg2160_attach(const struct lg2160_config *config,
        state->frontend.dtv_property_cache.atscmh_parade_id = 1;
 
        return &state->frontend;
-fail:
-       lg_warn("unable to detect LG216x hardware\n");
-       kfree(state);
-       return NULL;
 }
 EXPORT_SYMBOL(lg2160_attach);