---

yaml --- r: 366891 b: refs/heads/master c: 52f1f23 h: refs/heads/master i: 366889: b92bc30 366887: 6e7c541 v: v3
git-mirror · Mar 29, 2013 · bd2368f · bd2368f
1 parent e445fbe
commit bd2368f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bde03684323d12b5da0834475bf9964f064a403b
+refs/heads/master: 52f1f2303f131d6d287a5316e35a4ec0d8ac8b98
diff --git a/trunk/drivers/media/usb/em28xx/em28xx-camera.c b/trunk/drivers/media/usb/em28xx/em28xx-camera.c
@@ -301,6 +301,11 @@ int em28xx_detect_sensor(struct em28xx *dev)
 	if (dev->em28xx_sensor == EM28XX_NOSENSOR && ret < 0)
 		ret = em28xx_probe_sensor_omnivision(dev);
 
+	/*
+	 * NOTE: the Windows driver also probes i2c addresses
+	 *       0x22 (Samsung ?) and 0x66 (Kodak ?)
+	 */
+
 	if (dev->em28xx_sensor == EM28XX_NOSENSOR && ret < 0) {
 		em28xx_info("No sensor detected\n");
 		return -ENODEV;