summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/sdricoh_cs.c
diff options
context:
space:
mode:
authorPierre Ossman2008-12-31 19:56:05 +0100
committerPierre Ossman2008-12-31 19:56:05 +0100
commit418f19ea17a99421b22a64e101e14b6a16bed66d (patch)
tree7c21fcc368c63f1f9907deac6d16b30bd371792d /drivers/mmc/host/sdricoh_cs.c
parentsdricoh_cs: Add support for Bay Controller devices (diff)
parentmmc: warn about voltage mismatches (diff)
downloadkernel-qcow2-linux-418f19ea17a99421b22a64e101e14b6a16bed66d.tar.gz
kernel-qcow2-linux-418f19ea17a99421b22a64e101e14b6a16bed66d.tar.xz
kernel-qcow2-linux-418f19ea17a99421b22a64e101e14b6a16bed66d.zip
Merge branch 'master' of ../mmc
Diffstat (limited to 'drivers/mmc/host/sdricoh_cs.c')
-rw-r--r--drivers/mmc/host/sdricoh_cs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c
index 435863370017..cb41e9c3ac07 100644
--- a/drivers/mmc/host/sdricoh_cs.c
+++ b/drivers/mmc/host/sdricoh_cs.c
@@ -465,7 +465,7 @@ static int sdricoh_init_mmc(struct pci_dev *pci_dev,
err:
if (iobase)
- iounmap(iobase);
+ pci_iounmap(pci_dev, iobase);
if (mmc)
mmc_free_host(mmc);