diff --git a/[refs] b/[refs]
index b633d2c172cb..3c33d7a75d85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8aed3f479bd25c8ba452c00585c8c261747f9143
+refs/heads/master: b6cd9c4a1de9baa1a2dcd5349a8631c86a0cb61b
diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c b/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c
index 7ba3449b87e4..a9e6cbe26ce5 100644
--- a/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -1485,27 +1485,10 @@ void cx231xx_set_Colibri_For_LowIF(struct cx231xx *dev, u32 if_freq,
 
     u32 colibri_carrier_offset = 0;
     u8 status = 0;
-    u32 func_mode = 0;
+    u32 func_mode = 0x01; /* Device has an DIF if this function is called */
     u32 standard = 0;
 	u8 value[4] = { 0, 0, 0, 0 };
 
-	switch (dev->model) {
-	case CX231XX_BOARD_CNXT_CARRAERA:
-	case CX231XX_BOARD_CNXT_RDE_250:
-	case CX231XX_BOARD_CNXT_SHELBY:
-	case CX231XX_BOARD_CNXT_RDU_250:
-	case CX231XX_BOARD_CNXT_VIDEO_GRABBER:
-		func_mode = 0x03;
-		break;
-	case CX231XX_BOARD_CNXT_RDE_253S:
-	case CX231XX_BOARD_CNXT_RDU_253S:
-		func_mode = 0x01;
-		break;
-
-	default:
-		func_mode = 0x01;
-	}
-
 	cx231xx_info("Enter cx231xx_set_Colibri_For_LowIF()\n");
 		value[0] = (u8) 0x6F;
 		value[1] = (u8) 0x6F;