From bd2368fc82c1f066ae5f9cf0e04935c86697faf7 Mon Sep 17 00:00:00 2001 From: Frank Schaefer Date: Wed, 27 Mar 2013 17:06:35 -0300 Subject: [PATCH] --- yaml --- r: 366891 b: refs/heads/master c: 52f1f2303f131d6d287a5316e35a4ec0d8ac8b98 h: refs/heads/master i: 366889: b92bc30bb2f0100ece55a18cfe32ab2ab1ba1ced 366887: 6e7c5416af762151ff33baf833296e7b8b0c6e90 v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/em28xx/em28xx-camera.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3659cda6759e..3d106b0dee40 100644 --- 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 index e8b3322242c0..64b70d42da1e 100644 --- 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;