[PATCH] staging: comedi: ni_atmio: Handle return value of pnp_*

Arvind Yadav arvind.yadav.cs at gmail.com
Thu Nov 16 04:32:32 UTC 2017


pnp_irq() and pnp_port_start() can fail here and we must check
its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs at gmail.com>
---
 drivers/staging/comedi/drivers/ni_atmio.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c
index 2d62a8c..dead159 100644
--- a/drivers/staging/comedi/drivers/ni_atmio.c
+++ b/drivers/staging/comedi/drivers/ni_atmio.c
@@ -308,6 +308,9 @@ static int ni_atmio_attach(struct comedi_device *dev,
 
 		iobase = pnp_port_start(isapnp_dev, 0);
 		irq = pnp_irq(isapnp_dev, 0);
+		if (irq == -1 || !iobase)
+			return -ENOMEM;
+
 		comedi_set_hw_dev(dev, &isapnp_dev->dev);
 	}
 
-- 
1.9.1



More information about the devel mailing list