1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index bcd3c371009b..cf1d8c3655fc 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -467,6 +467,7 @@ static int dvb_init(struct em28xx *dev)
         }
         dev->dvb = dvb;
 
+        mutex_lock(&dev->lock);
         em28xx_set_mode(dev, EM28XX_DIGITAL_MODE);
         /* init frontend */
         switch (dev->model) {
@@ -506,6 +507,7 @@ static int dvb_init(struct em28xx *dev)
         case EM2880_BOARD_TERRATEC_HYBRID_XS_FR:
         case EM2881_BOARD_PINNACLE_HYBRID_PRO:
         case EM2882_BOARD_DIKOM_DK300:
+        case EM2882_BOARD_KWORLD_VS_DVBT:
                 dvb->frontend = dvb_attach(zl10353_attach,
                                            &em28xx_zl10353_xc3028_no_i2c_gate,
                                            &dev->i2c_adap);
@@ -589,15 +591,16 @@ static int dvb_init(struct em28xx *dev)
         if (result < 0)
                 goto out_free;
 
-        em28xx_set_mode(dev, EM28XX_SUSPEND);
         em28xx_info("Successfully loaded em28xx-dvb\n");
-        return 0;
+ret:
+        em28xx_set_mode(dev, EM28XX_SUSPEND);
+        mutex_unlock(&dev->lock);
+        return result;
 
 out_free:
-        em28xx_set_mode(dev, EM28XX_SUSPEND);
         kfree(dvb);
         dev->dvb = NULL;
-        return result;
+        goto ret;
 }
 
 static int dvb_fini(struct em28xx *dev)