Re: [patch] iio: adc: checking for NULL instead of IS_ERR() in probe

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 28/03/14 14:07, johannes thumshirn wrote:
On Fri, Mar 28, 2014 at 9:33 AM, Dan Carpenter <dan.carpenter@xxxxxxxxxx> wrote:

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

Fixes: 74aeac4da66f ('iio: adc: Add MEN 16z188 ADC driver')
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>

diff --git a/drivers/iio/adc/men_z188_adc.c b/drivers/iio/adc/men_z188_adc.c
index 6989c16..b58d630 100644
--- a/drivers/iio/adc/men_z188_adc.c
+++ b/drivers/iio/adc/men_z188_adc.c
@@ -121,8 +121,8 @@ static int men_z188_probe(struct mcb_device *dev,
         indio_dev->num_channels = ARRAY_SIZE(z188_adc_iio_channels);

         mem = mcb_request_mem(dev, "z188-adc");
-       if (!mem)
-               return -ENOMEM;
+       if (IS_ERR(mem))
+               return PTR_ERR(mem);

         adc->base = ioremap(mem->start, resource_size(mem));
         if (adc->base == NULL)

Acked-by: Johannes Thumshirn <johannes.thumshirn@xxxxxx>

Acked-by: Jonathan Cameron <jic23@xxxxxxxxxx>

Or I can pick this up after the merge window has closed if Greg hasn't
already taken it.

Jonathan
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Kernel Development]     [Kernel Announce]     [Kernel Newbies]     [Linux Networking Development]     [Share Photos]     [IDE]     [Security]     [Git]     [Netfilter]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Device Mapper]

  Powered by Linux