1 files changed, 2 insertions, 18 deletions

diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index 855ad3940b29..c99e2383b7ec 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -421,6 +421,8 @@ static int dvb_init(struct em28xx *dev)
                 }
                 break;
         case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
+        case EM2880_BOARD_TERRATEC_HYBRID_XS:
+        case EM2880_BOARD_KWORLD_DVB_310U:
                 dvb->frontend = dvb_attach(zl10353_attach,
                                            &em28xx_zl10353_with_xc3028,
                                            &dev->i2c_adap);
@@ -442,24 +444,6 @@ static int dvb_init(struct em28xx *dev)
                 }
                 break;
 #endif
-        case EM2880_BOARD_TERRATEC_HYBRID_XS:
-                dvb->frontend = dvb_attach(zl10353_attach,
-                                                &em28xx_zl10353_with_xc3028,
-                                                &dev->i2c_adap);
-                if (attach_xc3028(0x61, dev) < 0) {
-                         result = -EINVAL;
-                        goto out_free;
-                }
-                break;
-        case EM2880_BOARD_KWORLD_DVB_310U:
-                dvb->frontend = dvb_attach(zl10353_attach,
-                                                &em28xx_zl10353_with_xc3028,
-                                                &dev->i2c_adap);
-                if (attach_xc3028(0x61, dev) < 0) {
-                        result = -EINVAL;
-                        goto out_free;
-                }
-                break;
         default:
                 printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"
                                 " isn't supported yet\n",