Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4d3995b14ba7abcdd475d17b8751db55d8a95b9e

Authored by nickcheng
Committed by James Bottomley
1 parent e92e63aaba
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SCSI] arcmsr: fix iounmap error for Type B adapter 

The Type B Adapter teardown does iounmap on pointers subtracted by a
constant offset.  Since the offset is in bytes, we need the pointers to
be of type void * not uint32_t * so the subtraction is done in the
correct units and we iounmap the correct area.

Signed-off-by: Nick Cheng <nick.cheng@areca.com.tw>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

Showing 1 changed file with 7 additions and 7 deletions Side-by-side Diff

drivers/scsi/arcmsr/arcmsr.h
Diff comments   View file @ 4d3995b
... ... @@ -341,13 +341,13 @@
341 341 uint32_t done_qbuffer[ARCMSR_MAX_HBB_POSTQUEUE];
342 342 uint32_t postq_index;
343 343 uint32_t doneq_index;
344   - uint32_t __iomem *drv2iop_doorbell_reg;
345   - uint32_t __iomem *drv2iop_doorbell_mask_reg;
346   - uint32_t __iomem *iop2drv_doorbell_reg;
347   - uint32_t __iomem *iop2drv_doorbell_mask_reg;
348   - uint32_t __iomem *msgcode_rwbuffer_reg;
349   - uint32_t __iomem *ioctl_wbuffer_reg;
350   - uint32_t __iomem *ioctl_rbuffer_reg;
  344 + void __iomem *drv2iop_doorbell_reg;
  345 + void __iomem *drv2iop_doorbell_mask_reg;
  346 + void __iomem *iop2drv_doorbell_reg;
  347 + void __iomem *iop2drv_doorbell_mask_reg;
  348 + void __iomem *msgcode_rwbuffer_reg;
  349 + void __iomem *ioctl_wbuffer_reg;
  350 + void __iomem *ioctl_rbuffer_reg;
351 351 };
352 352  
353 353 /*