From b92bc30bb2f0100ece55a18cfe32ab2ab1ba1ced Mon Sep 17 00:00:00 2001
From: Frank Schaefer <fschaefer.oss@googlemail.com>
Date: Wed, 27 Mar 2013 17:06:33 -0300
Subject: [PATCH] --- yaml --- r: 366889 b: refs/heads/master c:
 0af0b25a64458c3ee002efe6e7542013b94a268a h: refs/heads/master i:   366887:
 6e7c5416af762151ff33baf833296e7b8b0c6e90 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/usb/em28xx/em28xx-camera.c  | 23 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 04183ebee06f..c9b4b09cf54e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 176013b19e848204895bfcaea8b9b39fba5b26dd
+refs/heads/master: 0af0b25a64458c3ee002efe6e7542013b94a268a
diff --git a/trunk/drivers/media/usb/em28xx/em28xx-camera.c b/trunk/drivers/media/usb/em28xx/em28xx-camera.c
index 2e4856aebae8..d744af6f7d08 100644
--- a/trunk/drivers/media/usb/em28xx/em28xx-camera.c
+++ b/trunk/drivers/media/usb/em28xx/em28xx-camera.c
@@ -83,9 +83,9 @@ static int em28xx_initialize_mt9m001(struct em28xx *dev)
 
 
 /*
- * This method works for webcams with Micron sensors
+ * Probes Micron sensors with 8 bit address and 16 bit register width
  */
-int em28xx_detect_sensor(struct em28xx *dev)
+static int em28xx_probe_sensor_micron(struct em28xx *dev)
 {
 	int ret, i;
 	char *name;
@@ -96,7 +96,6 @@ int em28xx_detect_sensor(struct em28xx *dev)
 	struct i2c_client client = dev->i2c_client[dev->def_i2c_bus];
 
 	dev->em28xx_sensor = EM28XX_NOSENSOR;
-	/* Probe Micron sensors with 8 bit address and 16 bit register width */
 	for (i = 0; micron_sensor_addrs[i] != I2C_CLIENT_END; i++) {
 		client.addr = micron_sensor_addrs[i];
 		/* NOTE: i2c_smbus_read_word_data() doesn't work with BE data */
@@ -167,7 +166,7 @@ int em28xx_detect_sensor(struct em28xx *dev)
 		default:
 			em28xx_info("unknown Micron sensor detected: 0x%04x\n",
 				    id);
-			return -EINVAL;
+			return 0;
 		}
 
 		if (dev->em28xx_sensor == EM28XX_NOSENSOR)
@@ -182,6 +181,22 @@ int em28xx_detect_sensor(struct em28xx *dev)
 	return -ENODEV;
 }
 
+/*
+ * This method works for webcams with Micron sensors
+ */
+int em28xx_detect_sensor(struct em28xx *dev)
+{
+	int ret;
+
+	ret = em28xx_probe_sensor_micron(dev);
+	if (dev->em28xx_sensor == EM28XX_NOSENSOR && ret < 0) {
+		em28xx_info("No sensor detected\n");
+		return -ENODEV;
+	}
+
+	return 0;
+}
+
 int em28xx_init_camera(struct em28xx *dev)
 {
 	switch (dev->em28xx_sensor) {