diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 15:29:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-01 15:29:00 +1100 |
| commit | 434b5df8562629e3a82580d9a83f55707673c4e7 (patch) | |
| tree | 92e3c9e936e4da054828a2bb9bb96bbd3dd8c274 | |
| parent | 9f49a1a5b99c6ae32b3749eff727377c8c253795 (diff) | |
| parent | f1e8f6787565d79d114dca4fb0c50fdec13e275b (diff) | |
Merge commit 'mmc/next'
| -rw-r--r-- | drivers/mmc/card/block.c | 6 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-pci.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 3d067c35185d..903c8aae54bb 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -145,7 +145,7 @@ struct mmc_blk_request { static u32 mmc_sd_num_wr_blocks(struct mmc_card *card) { int err; - u32 blocks; + __be32 blocks; struct mmc_request mrq; struct mmc_command cmd; @@ -204,9 +204,7 @@ static u32 mmc_sd_num_wr_blocks(struct mmc_card *card) if (cmd.error || data.error) return (u32)-1; - blocks = ntohl(blocks); - - return blocks; + return ntohl(blocks); } static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 9bd7026b0021..f07255cb17ee 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -545,7 +545,7 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot( } addr = pci_resource_start(pdev, bar); - host->ioaddr = ioremap_nocache(addr, pci_resource_len(pdev, bar)); + host->ioaddr = pci_ioremap_bar(pdev, bar); if (!host->ioaddr) { dev_err(&pdev->dev, "failed to remap registers\n"); goto release; |