OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d27f25c
)
tifm: fix error return code in tifm_7xx1_probe()
author
Wei Yongjun
<yongjun_wei@trendmicro.com.cn>
Wed, 30 Oct 2013 05:35:20 +0000
(13:35 +0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 30 Oct 2013 17:19:30 +0000
(10:19 -0700)
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>
drivers/misc/tifm_7xx1.c
patch
|
blob
|
history
diff --git
a/drivers/misc/tifm_7xx1.c
b/drivers/misc/tifm_7xx1.c
index
ae282a1
..
a606c89
100644
(file)
--- 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)