From 434a2bd1a605c0b4792fb9f945e69fc7ec18e66a Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Wed, 21 Nov 2012 16:27:00 +0000
Subject: [PATCH] --- yaml --- r: 338320 b: refs/heads/master c:
 e786cc26dcc52caba53d17a80888ed0b46d097f8 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/iio/adc/ad7793.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f27713467dd3..0ba9802e7632 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 891c8bcec1e12ed0f2830c52e863d2723e9dbd4e
+refs/heads/master: e786cc26dcc52caba53d17a80888ed0b46d097f8
diff --git a/trunk/drivers/staging/iio/adc/ad7793.c b/trunk/drivers/staging/iio/adc/ad7793.c
index fce5156f74df..8928609a1828 100644
--- a/trunk/drivers/staging/iio/adc/ad7793.c
+++ b/trunk/drivers/staging/iio/adc/ad7793.c
@@ -102,8 +102,10 @@
 #define AD7795_CH_AIN1M_AIN1M	8 /* AIN1(-) - AIN1(-) */
 
 /* ID Register Bit Designations (AD7793_REG_ID) */
+#define AD7785_ID		0xB
 #define AD7792_ID		0xA
 #define AD7793_ID		0xB
+#define AD7794_ID		0xF
 #define AD7795_ID		0xF
 #define AD7793_ID_MASK		0xF
 
@@ -130,6 +132,7 @@
  */
 
 struct ad7793_chip_info {
+	unsigned int id;
 	const struct iio_chan_spec *channels;
 	unsigned int num_channels;
 };
@@ -231,7 +234,7 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 
 	id &= AD7793_ID_MASK;
 
-	if (!((id == AD7792_ID) || (id == AD7793_ID) || (id == AD7795_ID))) {
+	if (id != st->chip_info->id) {
 		dev_err(&st->sd.spi->dev, "device ID query failed\n");
 		goto out;
 	}
@@ -531,22 +534,27 @@ static DECLARE_AD7795_CHANNELS(ad7795, 24, 32);
 
 static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
 	[ID_AD7785] = {
+		.id = AD7785_ID,
 		.channels = ad7785_channels,
 		.num_channels = ARRAY_SIZE(ad7785_channels),
 	},
 	[ID_AD7792] = {
+		.id = AD7792_ID,
 		.channels = ad7792_channels,
 		.num_channels = ARRAY_SIZE(ad7792_channels),
 	},
 	[ID_AD7793] = {
+		.id = AD7793_ID,
 		.channels = ad7793_channels,
 		.num_channels = ARRAY_SIZE(ad7793_channels),
 	},
 	[ID_AD7794] = {
+		.id = AD7794_ID,
 		.channels = ad7794_channels,
 		.num_channels = ARRAY_SIZE(ad7794_channels),
 	},
 	[ID_AD7795] = {
+		.id = AD7795_ID,
 		.channels = ad7795_channels,
 		.num_channels = ARRAY_SIZE(ad7795_channels),
 	},