From: Jonathan Cameron <jic23@kernel.org>
To: johannes thumshirn <morbidrsa@gmail.com>,
Dan Carpenter <dan.carpenter@oracle.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-iio@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [patch] iio: adc: checking for NULL instead of IS_ERR() in probe
Date: Sat, 29 Mar 2014 09:58:52 +0000 [thread overview]
Message-ID: <5336995C.90701@kernel.org> (raw)
In-Reply-To: <CAGH8bx77dKAm7w53F5MfTXaPm6KxQcVCXERnW-oXmR5Ww-HLTw@mail.gmail.com>
On 28/03/14 14:07, johannes thumshirn wrote:
> On Fri, Mar 28, 2014 at 9:33 AM, Dan Carpenter <dan.carpenter@oracle.com> 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@oracle.com>
>>
>> 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@men.de>
>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Or I can pick this up after the merge window has closed if Greg hasn't
already taken it.
Jonathan
next prev parent reply other threads:[~2014-03-29 9:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-28 8:33 [patch] iio: adc: checking for NULL instead of IS_ERR() in probe Dan Carpenter
2014-03-28 14:07 ` johannes thumshirn
2014-03-29 9:58 ` Jonathan Cameron [this message]
2014-06-12 18:44 ` Johannes Thumshirn
2014-06-14 15:17 ` Jonathan Cameron
2014-06-15 15:23 ` Johannes Thumshirn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5336995C.90701@kernel.org \
--to=jic23@kernel.org \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=morbidrsa@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).