aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-10-30 13:35:20 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-30 10:19:30 -0700
commit86d6275a8f1b7ba64b79a46c7616264302f44410 (patch)
treea96737bdd6be5d4b64ab90bf19e9f476f59c9b43 /drivers/misc
parentw1-gpio: Use devm_* functions (diff)
downloadlinux-dev-86d6275a8f1b7ba64b79a46c7616264302f44410.tar.xz
linux-dev-86d6275a8f1b7ba64b79a46c7616264302f44410.zip
tifm: fix error return code in tifm_7xx1_probe()
Fix to return ENODEV in the pci ioremap 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/misc')
-rw-r--r--drivers/misc/tifm_7xx1.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c
index ae282a100429..a606c8901e18 100644
--- a/drivers/misc/tifm_7xx1.c
+++ b/drivers/misc/tifm_7xx1.c
@@ -356,8 +356,10 @@ static int tifm_7xx1_probe(struct pci_dev *dev,
pci_set_drvdata(dev, fm);
fm->addr = pci_ioremap_bar(dev, 0);
- if (!fm->addr)
+ if (!fm->addr) {
+ rc = -ENODEV;
goto err_out_free;
+ }
rc = request_irq(dev->irq, tifm_7xx1_isr, IRQF_SHARED, DRIVER_NAME, fm);
if (rc)