diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2008-12-31 13:56:05 -0500 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-12-31 13:56:05 -0500 |
| commit | 418f19ea17a99421b22a64e101e14b6a16bed66d (patch) | |
| tree | 7c21fcc368c63f1f9907deac6d16b30bd371792d /drivers/mmc/host/sdricoh_cs.c | |
| parent | 98444d3dd975653a4a970ecc0dfc30918da92f60 (diff) | |
| parent | f6e10b865c3ea56bdaa8c6ecfee313b997900dbb (diff) | |
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, | |||
| 465 | 465 | ||
| 466 | err: | 466 | err: |
| 467 | if (iobase) | 467 | if (iobase) |
| 468 | iounmap(iobase); | 468 | pci_iounmap(pci_dev, iobase); |
| 469 | if (mmc) | 469 | if (mmc) |
| 470 | mmc_free_host(mmc); | 470 | mmc_free_host(mmc); |
| 471 | 471 | ||