X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=drivers%2Fiio%2Fadc%2Fstm32-adc.c;fp=drivers%2Fiio%2Fadc%2Fstm32-adc.c;h=c105d82c3e4545983a2f313e95df60ff0bd232bd;hb=9c0d6ccd7d6bbd275e390b55a3390b4274291d95;hp=1aadb2ad2cabdf12130030d4bf8b341b0fb93c42;hpb=e55245d115bb9054cb72cdd5dda5660f4484873a;p=sfrench%2Fcifs-2.6.git diff --git a/drivers/iio/adc/stm32-adc.c b/drivers/iio/adc/stm32-adc.c index 1aadb2ad2cab..c105d82c3e45 100644 --- a/drivers/iio/adc/stm32-adc.c +++ b/drivers/iio/adc/stm32-adc.c @@ -2006,16 +2006,15 @@ static int stm32_adc_get_legacy_chan_count(struct iio_dev *indio_dev, struct stm * to get the *real* number of channels. */ ret = device_property_count_u32(dev, "st,adc-diff-channels"); - if (ret < 0) - return ret; - - ret /= (int)(sizeof(struct stm32_adc_diff_channel) / sizeof(u32)); - if (ret > adc_info->max_channels) { - dev_err(&indio_dev->dev, "Bad st,adc-diff-channels?\n"); - return -EINVAL; - } else if (ret > 0) { - adc->num_diff = ret; - num_channels += ret; + if (ret > 0) { + ret /= (int)(sizeof(struct stm32_adc_diff_channel) / sizeof(u32)); + if (ret > adc_info->max_channels) { + dev_err(&indio_dev->dev, "Bad st,adc-diff-channels?\n"); + return -EINVAL; + } else if (ret > 0) { + adc->num_diff = ret; + num_channels += ret; + } } /* Optional sample time is provided either for each, or all channels */