diff --git a/[refs] b/[refs]
index ae373b0f338d..2f4787d58750 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 793927372626bae48b32db24dddde40d73923a9c
+refs/heads/master: b1fa26c66c975bbd3173a45ef673870fd1d52dea
diff --git a/trunk/drivers/media/video/em28xx/em28xx-cards.c b/trunk/drivers/media/video/em28xx/em28xx-cards.c
index fecfe170b36e..4b78a03528f5 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-cards.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-cards.c
@@ -1409,6 +1409,10 @@ void em28xx_pre_card_setup(struct em28xx *dev)
 		case CHIP_ID_EM2860:
 			em28xx_info("chip ID is em2860\n");
 			break;
+		case CHIP_ID_EM2870:
+			em28xx_info("chip ID is em2870\n");
+			dev->wait_after_write = 0;
+			break;
 		case CHIP_ID_EM2874:
 			em28xx_info("chip ID is em2874\n");
 			dev->reg_gpio_num = EM2874_R80_GPIO;
diff --git a/trunk/drivers/media/video/em28xx/em28xx-reg.h b/trunk/drivers/media/video/em28xx/em28xx-reg.h
index 45d588c3a6c5..a459b7c6a6c9 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-reg.h
+++ b/trunk/drivers/media/video/em28xx/em28xx-reg.h
@@ -151,6 +151,7 @@ enum em28xx_chip_id {
 	CHIP_ID_EM2840 = 20,
 	CHIP_ID_EM2750 = 33,
 	CHIP_ID_EM2860 = 34,
+	CHIP_ID_EM2870 = 35,
 	CHIP_ID_EM2883 = 36,
 	CHIP_ID_EM2874 = 65,
 };