git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
[safe/jmp/linux-2.6]
/
drivers
/
misc
/
tifm_7xx1.c
diff --git
a/drivers/misc/tifm_7xx1.c
b/drivers/misc/tifm_7xx1.c
index
e71eba3
..
be5672a
100644
(file)
--- a/
drivers/misc/tifm_7xx1.c
+++ b/
drivers/misc/tifm_7xx1.c
@@
-354,8
+354,7
@@
static int tifm_7xx1_probe(struct pci_dev *dev,
fm->has_ms_pif = tifm_7xx1_has_ms_pif;
pci_set_drvdata(dev, fm);
- fm->addr = ioremap(pci_resource_start(dev, 0),
- pci_resource_len(dev, 0));
+ fm->addr = pci_ioremap_bar(dev, 0);
if (!fm->addr)
goto err_out_free;