From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonathan Cameron Date: Sat, 14 Jun 2014 15:17:23 +0000 Subject: Re: [patch] iio: adc: checking for NULL instead of IS_ERR() in probe Message-Id: <539C6783.4060607@kernel.org> List-Id: References: <20140328083126.GO25192@mwanda> <5336995C.90701@kernel.org> <87lht2q86y.fsf@sauron.localdomain> In-Reply-To: <87lht2q86y.fsf@sauron.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Johannes Thumshirn Cc: Dan Carpenter , Greg Kroah-Hartman , linux-iio@vger.kernel.org, kernel-janitors@vger.kernel.org On 12/06/14 19:44, Johannes Thumshirn wrote: > Jonathan Cameron writes: > >> On 28/03/14 14:07, johannes thumshirn wrote: >>> On Fri, Mar 28, 2014 at 9:33 AM, Dan Carpenter 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 >>>> >>>> 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 >>> >> Acked-by: Jonathan Cameron >> >> Or I can pick this up after the merge window has closed if Greg hasn't >> already taken it. >> >> Jonathan > > Did someone actually take this patch, or was it somehow lost? > I've picked it up now and applied it to the fixes-togreg branch of iio.git Thanks for pointing out I'd forgotten it and sorry about that. I've also marked it for stable. > Johannes >