]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
xen-pciback: fix error return code in pcistub_irq_handler_switch()
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Fri, 31 May 2013 11:59:20 +0000 (19:59 +0800)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Mon, 10 Jun 2013 12:43:28 +0000 (08:43 -0400)
Fix to return -ENOENT in the pcistub_device_find() and pci_get_drvdata()
error handling case instead of 0(overwrite to 0 by str_to_slot()), as done
elsewhere in this function.

Acked-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
drivers/xen/xen-pciback/pci_stub.c

index 4e8ba38aa0c9cb0499ecdf27172baf44d55a65b5..0020899182604cdf72548e66c41c2582c76b3bd9 100644 (file)
@@ -1196,19 +1196,23 @@ static ssize_t pcistub_irq_handler_switch(struct device_driver *drv,
        struct pcistub_device *psdev;
        struct xen_pcibk_dev_data *dev_data;
        int domain, bus, slot, func;
-       int err = -ENOENT;
+       int err;
 
        err = str_to_slot(buf, &domain, &bus, &slot, &func);
        if (err)
                return err;
 
        psdev = pcistub_device_find(domain, bus, slot, func);
-       if (!psdev)
+       if (!psdev) {
+               err = -ENOENT;
                goto out;
+       }
 
        dev_data = pci_get_drvdata(psdev->dev);
-       if (!dev_data)
+       if (!dev_data) {
+               err = -ENOENT;
                goto out;
+       }
 
        dev_dbg(&psdev->dev->dev, "%s fake irq handler: %d->%d\n",
                dev_data->irq_name, dev_data->isr_on,