From: Jonathan Cameron Date: Fri, 12 Aug 2011 15:55:29 +0000 (+0100) Subject: staging:iio:adc: max1363 fix 2 raw sysfs issues. X-Git-Tag: MMI-PSA29.97-13-9~18234^2^2~864^2~258 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cd0380190f7c7ad8d5a8f15403a67fedd37fcddb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging:iio:adc: max1363 fix 2 raw sysfs issues. indio_dev->channels was accidentally removed thus preventing any sysfs registrations occuring for direct reading. That hid the other issue. Unfortunately the incorrect handling leads to misspresentation of data in sysfs reads. Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c index 72b0917412ee..d93b7a917b99 100644 --- a/drivers/staging/iio/adc/max1363_core.c +++ b/drivers/staging/iio/adc/max1363_core.c @@ -255,7 +255,7 @@ static int max1363_read_raw(struct iio_dev *indio_dev, switch (m) { case 0: ret = max1363_read_single_chan(indio_dev, chan, val, m); - if (ret) + if (ret < 0) return ret; return IIO_VAL_INT; case (1 << IIO_CHAN_INFO_SCALE_SHARED): @@ -1295,6 +1295,8 @@ static int __devinit max1363_probe(struct i2c_client *client, indio_dev->info = st->chip_info->info; indio_dev->modes = INDIO_DIRECT_MODE; + indio_dev->channels = st->chip_info->channels; + indio_dev->num_channels = st->chip_info->num_channels; ret = max1363_initial_setup(st); if (ret < 0) goto error_free_available_scan_masks;