Peter Senna Tschudin
2012-Sep-17 17:31 UTC
[PATCH] drivers/virtio/virtio_pci.c: fix error return code
From: Peter Senna Tschudin <peter.senna at gmail.com>
Convert a nonnegative error return code to a negative one, as returned
elsewhere in the function.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
(
if at p1 (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret at p1 = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
Signed-off-by: Peter Senna Tschudin <peter.senna at gmail.com>
---
drivers/virtio/virtio_pci.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 42b2076..c33aea3 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -719,8 +719,10 @@ static int __devinit virtio_pci_probe(struct pci_dev
*pci_dev,
goto out_enable_device;
vp_dev->ioaddr = pci_iomap(pci_dev, 0, 0);
- if (vp_dev->ioaddr == NULL)
+ if (vp_dev->ioaddr == NULL) {
+ err = -ENOMEM;
goto out_req_regions;
+ }
pci_set_drvdata(pci_dev, vp_dev);
pci_set_master(pci_dev);
--
1.7.11.4
Rusty Russell
2012-Sep-18 00:49 UTC
[PATCH] drivers/virtio/virtio_pci.c: fix error return code
Peter Senna Tschudin <peter.senna at gmail.com> writes:> From: Peter Senna Tschudin <peter.senna at gmail.com> > > Convert a nonnegative error return code to a negative one, as returned > elsewhere in the function.Thanks! Applied, Rusty.