diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-06-07 04:16:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 07:38:17 +0200 |
| commit | 214da6728acac285cac0e8e9b6c4c13838b8e1b0 (patch) | |
| tree | 318085f92824bcd8693c8b4f1848aa7d9d0efa81 /drivers/pcmcia | |
| parent | Merge 3.10-rc5 into char-misc-next (diff) | |
| download | linux-214da6728acac285cac0e8e9b6c4c13838b8e1b0.tar.xz linux-214da6728acac285cac0e8e9b6c4c13838b8e1b0.zip | |
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, if (!pci_resource_start(dev, 0)) { dev_warn(&dev->dev, "refusing to load the driver as the " "io_base is NULL.\n"); + ret = -ENOMEM; goto err_out_disable; } @@ -673,6 +674,7 @@ static int pd6729_pci_probe(struct pci_dev *dev, mask = pd6729_isa_scan(); if (irq_mode == 0 && mask == 0) { dev_warn(&dev->dev, "no ISA interrupt is available.\n"); + ret = -ENODEV; goto err_out_free_res; } |