a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iio: adc: checking for NULL instead of IS_ERR() in probe

Browse Source 
mcb_request_mem() returns an ERR_PTR(), it doesn't return NULL.

Fixes: 74aeac4da6 ('iio: adc: Add MEN 16z188 ADC driver')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Cc: Stable@vger.kernel.org
This commit is contained in:
Dan Carpenter 2014-03-28 08:33:00 +00:00 committed by Jonathan Cameron
parent 4f3bcd878f
commit e94f62e79f
1 changed files with 2 additions and 2 deletions

4
drivers/iio/adc/men_z188_adc.c
View File

@ -121,8 +121,8 @@ static int men_z188_probe(struct mcb_device *dev,
indio_dev->num_channels = ARRAY_SIZE(z188_adc_iio_channels); indio_dev->num_channels = ARRAY_SIZE(z188_adc_iio_channels);
mem = mcb_request_mem(dev, "z188-adc"); mem = mcb_request_mem(dev, "z188-adc");
if (!mem) if (IS_ERR(mem))
return -ENOMEM; return PTR_ERR(mem);
adc->base = ioremap(mem->start, resource_size(mem)); adc->base = ioremap(mem->start, resource_size(mem));
if (adc->base == NULL) if (adc->base == NULL)