diff options
author | Pierre Ossman <drzeus@drzeus.cx> | 2008-12-31 19:56:05 +0100 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-12-31 19:56:05 +0100 |
commit | 418f19ea17a99421b22a64e101e14b6a16bed66d (patch) | |
tree | 7c21fcc368c63f1f9907deac6d16b30bd371792d /drivers/mmc/host/sdricoh_cs.c | |
parent | sdricoh_cs: Add support for Bay Controller devices (diff) | |
parent | mmc: warn about voltage mismatches (diff) | |
download | linux-418f19ea17a99421b22a64e101e14b6a16bed66d.tar.xz 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.c | 2 |
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); |