diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-06-06 22:16:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 01:38:17 -0400 |
commit | 214da6728acac285cac0e8e9b6c4c13838b8e1b0 (patch) | |
tree | 318085f92824bcd8693c8b4f1848aa7d9d0efa81 /drivers/pcmcia | |
parent | 38a4671cad3f0d277cf48445b49e42a475ebfb6a (diff) |
pcmcia: pd6729: fix error return code in pd6729_pci_probe()
Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/pd6729.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index b29d97e170ae..a4c16ee5c718 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c | |||
@@ -644,6 +644,7 @@ static int pd6729_pci_probe(struct pci_dev *dev, | |||
644 | if (!pci_resource_start(dev, 0)) { | 644 | if (!pci_resource_start(dev, 0)) { |
645 | dev_warn(&dev->dev, "refusing to load the driver as the " | 645 | dev_warn(&dev->dev, "refusing to load the driver as the " |
646 | "io_base is NULL.\n"); | 646 | "io_base is NULL.\n"); |
647 | ret = -ENOMEM; | ||
647 | goto err_out_disable; | 648 | goto err_out_disable; |
648 | } | 649 | } |
649 | 650 | ||
@@ -673,6 +674,7 @@ static int pd6729_pci_probe(struct pci_dev *dev, | |||
673 | mask = pd6729_isa_scan(); | 674 | mask = pd6729_isa_scan(); |
674 | if (irq_mode == 0 && mask == 0) { | 675 | if (irq_mode == 0 && mask == 0) { |
675 | dev_warn(&dev->dev, "no ISA interrupt is available.\n"); | 676 | dev_warn(&dev->dev, "no ISA interrupt is available.\n"); |
677 | ret = -ENODEV; | ||
676 | goto err_out_free_res; | 678 | goto err_out_free_res; |
677 | } | 679 | } |
678 | 680 | ||