[media] media: em28xx - add error handling for KWORLD dvb_attach failures

Add error hanlding when EM2870_BOARD_KWORLD_A340 dvb_attach()
for fe and tuner fail in em28xx_dvb_init().

Signed-off-by: Shuah Khan <shuah.kh@samsung.com>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index 5f90890b9558b07ae4beb2e947131a2009f50359..2cf34efc95175343d9ea3fa0fb5a09e5e050eb9f 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -1213,9 +1213,17 @@ static int em28xx_dvb_init(struct em28xx *dev)
                dvb->fe[0] = dvb_attach(lgdt3305_attach,
                                           &em2870_lgdt3304_dev,
                                           &dev->i2c_adap[dev->def_i2c_bus]);
-               if (dvb->fe[0] != NULL)
-                       dvb_attach(tda18271_attach, dvb->fe[0], 0x60,
-                                  &dev->i2c_adap[dev->def_i2c_bus], &kworld_a340_config);
+               if (!dvb->fe[0]) {
+                       result = -EINVAL;
+                       goto out_free;
+               }
+               if (!dvb_attach(tda18271_attach, dvb->fe[0], 0x60,
+                       &dev->i2c_adap[dev->def_i2c_bus],
+                       &kworld_a340_config)) {
+                               dvb_frontend_detach(dvb->fe[0]);
+                               result = -EINVAL;
+                               goto out_free;
+               }
                break;
        case EM28174_BOARD_PCTV_290E:
                /* set default GPIO0 for LNA, used if GPIOLIB is undefined */