aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/myri10ge/myri10ge.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 3305ce3c5b3f..3ab0e5289f7a 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -3720,14 +3720,14 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
3720 if (mgp->sram_size > mgp->board_span) { 3720 if (mgp->sram_size > mgp->board_span) {
3721 dev_err(&pdev->dev, "board span %ld bytes too small\n", 3721 dev_err(&pdev->dev, "board span %ld bytes too small\n",
3722 mgp->board_span); 3722 mgp->board_span);
3723 goto abort_with_wc; 3723 goto abort_with_mtrr;
3724 } 3724 }
3725 mgp->sram = ioremap(mgp->iomem_base, mgp->board_span); 3725 mgp->sram = ioremap_wc(mgp->iomem_base, mgp->board_span);
3726 if (mgp->sram == NULL) { 3726 if (mgp->sram == NULL) {
3727 dev_err(&pdev->dev, "ioremap failed for %ld bytes at 0x%lx\n", 3727 dev_err(&pdev->dev, "ioremap failed for %ld bytes at 0x%lx\n",
3728 mgp->board_span, mgp->iomem_base); 3728 mgp->board_span, mgp->iomem_base);
3729 status = -ENXIO; 3729 status = -ENXIO;
3730 goto abort_with_wc; 3730 goto abort_with_mtrr;
3731 } 3731 }
3732 memcpy_fromio(mgp->eeprom_strings, 3732 memcpy_fromio(mgp->eeprom_strings,
3733 mgp->sram + mgp->sram_size - MYRI10GE_EEPROM_STRINGS_SIZE, 3733 mgp->sram + mgp->sram_size - MYRI10GE_EEPROM_STRINGS_SIZE,
@@ -3828,7 +3828,7 @@ abort_with_firmware:
3828abort_with_ioremap: 3828abort_with_ioremap:
3829 iounmap(mgp->sram); 3829 iounmap(mgp->sram);
3830 3830
3831abort_with_wc: 3831abort_with_mtrr:
3832#ifdef CONFIG_MTRR 3832#ifdef CONFIG_MTRR
3833 if (mgp->mtrr >= 0) 3833 if (mgp->mtrr >= 0)
3834 mtrr_del(mgp->mtrr, mgp->iomem_base, mgp->board_span); 3834 mtrr_del(mgp->mtrr, mgp->iomem_base, mgp->board_span);