linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] iio: adc: mcp3911: return proper error code on failure to allocate trigger
@ 2022-09-27  9:25 Marcus Folkesson
  2022-10-02 12:55 ` Jonathan Cameron
  0 siblings, 1 reply; 2+ messages in thread
From: Marcus Folkesson @ 2022-09-27  9:25 UTC (permalink / raw)
  To: Marcus Folkesson, Kent Gustavsson, Jonathan Cameron, Lars-Peter Clausen
  Cc: linux-iio, linux-kernel, kernel test robot, Dan Carpenter

smatch warnings:
drivers/iio/adc/mcp3911.c:441 mcp3911_probe() warn: passing zero to 'PTR_ERR'

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
 drivers/iio/adc/mcp3911.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
index 0d768006eabb..e55db02c534f 100644
--- a/drivers/iio/adc/mcp3911.c
+++ b/drivers/iio/adc/mcp3911.c
@@ -554,7 +554,7 @@ static int mcp3911_probe(struct spi_device *spi)
 				indio_dev->name,
 				iio_device_id(indio_dev));
 		if (!adc->trig)
-			return PTR_ERR(adc->trig);
+			return -ENOMEM;
 
 		adc->trig->ops = &mcp3911_trigger_ops;
 		iio_trigger_set_drvdata(adc->trig, adc);
-- 
2.37.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] iio: adc: mcp3911: return proper error code on failure to allocate trigger
  2022-09-27  9:25 [PATCH] iio: adc: mcp3911: return proper error code on failure to allocate trigger Marcus Folkesson
@ 2022-10-02 12:55 ` Jonathan Cameron
  0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2022-10-02 12:55 UTC (permalink / raw)
  To: Marcus Folkesson
  Cc: Kent Gustavsson, Lars-Peter Clausen, linux-iio, linux-kernel,
	kernel test robot, Dan Carpenter

On Tue, 27 Sep 2022 11:25:37 +0200
Marcus Folkesson <marcus.folkesson@gmail.com> wrote:

> smatch warnings:
> drivers/iio/adc/mcp3911.c:441 mcp3911_probe() warn: passing zero to 'PTR_ERR'
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Applied, with addition of fixes tag to the fixes-togreg branch of iio.git.
Slightly messy at this point in the cycle, but I can't push this out until
Linus takes Greg's char-misc-next pull request as otherwise linux-next will
get the content of Greg's tree via mine an potentially make a mess.

Should only matter for a few days though then I'll push my fixes-togreg branch
out (which I've moved to being based on char-misc-next to allow me to apply
a few patches for things only recently introduced).

Jonathan

> ---
>  drivers/iio/adc/mcp3911.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
> index 0d768006eabb..e55db02c534f 100644
> --- a/drivers/iio/adc/mcp3911.c
> +++ b/drivers/iio/adc/mcp3911.c
> @@ -554,7 +554,7 @@ static int mcp3911_probe(struct spi_device *spi)
>  				indio_dev->name,
>  				iio_device_id(indio_dev));
>  		if (!adc->trig)
> -			return PTR_ERR(adc->trig);
> +			return -ENOMEM;
>  
>  		adc->trig->ops = &mcp3911_trigger_ops;
>  		iio_trigger_set_drvdata(adc->trig, adc);


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-10-02 12:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-27  9:25 [PATCH] iio: adc: mcp3911: return proper error code on failure to allocate trigger Marcus Folkesson
2022-10-02 12:55 ` Jonathan Cameron

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).