diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2012-11-21 16:27:00 +0000 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2012-11-30 12:57:08 +0000 |
| commit | e786cc26dcc52caba53d17a80888ed0b46d097f8 (patch) | |
| tree | 1783f4e8d47eda541a68caaf8b6bbd3f97253dc7 /drivers | |
| parent | 891c8bcec1e12ed0f2830c52e863d2723e9dbd4e (diff) | |
staging:iio:ad7793: Implement stricter id checking
Instead of checking whether the id of the current device matches the id of any
device supported by the driver, check whether it matches the id of the device
which the driver was instantiated for. This makes sure that the driver is not
accidentally instantiated for the wrong device.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/iio/adc/ad7793.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c index fce5156f74df..8928609a1828 100644 --- a/drivers/staging/iio/adc/ad7793.c +++ b/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), }, |