diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-09-25 05:14:45 +0200 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-09-25 05:14:45 +0200 |
commit | 4e0c1159d83a658d1ffba5bc3442f4ec4cadb436 (patch) | |
tree | 36a5079ba7ba9b9e0f2f633356705b980940eac4 /drivers/scsi/qla2xxx/qla_dbg.c | |
parent | drm: add radeon PCI express support (diff) | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-ucb (diff) | |
download | linux-4e0c1159d83a658d1ffba5bc3442f4ec4cadb436.tar.xz linux-4e0c1159d83a658d1ffba5bc3442f4ec4cadb436.zip |
update from upstream
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_dbg.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_dbg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c index 72bbaa91dc77..9791496fa788 100644 --- a/drivers/scsi/qla2xxx/qla_dbg.c +++ b/drivers/scsi/qla2xxx/qla_dbg.c @@ -1334,7 +1334,7 @@ qla24xx_fw_dump(scsi_qla_host_t *ha, int hardware_locked) dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0); WRT_REG_DWORD(dmp_reg, 0xB0200000); - dmp_reg = (uint32_t *)((uint8_t *)reg + 0xFC); + dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xFC); fw->shadow_reg[2] = RD_REG_DWORD(dmp_reg); dmp_reg = (uint32_t __iomem *)((uint8_t __iomem *)reg + 0xF0); |