diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-29 01:08:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 10:41:33 -0400 |
commit | db3a91fe2b425c9adde47069efebdba44e665cef (patch) | |
tree | 85137ad8531f2dfa667bad11c82116c8f5feed48 /drivers/scsi/arcmsr/arcmsr.h | |
parent | 142956af525002c5378e7d91d81a01189841a785 (diff) |
deal with resource allocation bugs in arcmsr
a) for type B we should _not_ iounmap() acb->pmu; it's not ioremapped.
b) for type B we should iounmap() two regions we _do_ ioremap.
c) if ioremap() fails, we need to bail out (and clean up).
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi/arcmsr/arcmsr.h')
-rw-r--r-- | drivers/scsi/arcmsr/arcmsr.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/scsi/arcmsr/arcmsr.h b/drivers/scsi/arcmsr/arcmsr.h index 3c38cd8d7117..a67e29f83ae5 100644 --- a/drivers/scsi/arcmsr/arcmsr.h +++ b/drivers/scsi/arcmsr/arcmsr.h | |||
@@ -348,14 +348,6 @@ struct MessageUnit_B | |||
348 | uint32_t __iomem *ioctl_rbuffer_reg; | 348 | uint32_t __iomem *ioctl_rbuffer_reg; |
349 | }; | 349 | }; |
350 | 350 | ||
351 | struct MessageUnit | ||
352 | { | ||
353 | union | ||
354 | { | ||
355 | struct MessageUnit_A pmu_A; | ||
356 | struct MessageUnit_B pmu_B; | ||
357 | } u; | ||
358 | }; | ||
359 | /* | 351 | /* |
360 | ******************************************************************************* | 352 | ******************************************************************************* |
361 | ** Adapter Control Block | 353 | ** Adapter Control Block |
@@ -375,7 +367,6 @@ struct AdapterControlBlock | |||
375 | uint32_t outbound_int_enable; | 367 | uint32_t outbound_int_enable; |
376 | 368 | ||
377 | union { | 369 | union { |
378 | struct MessageUnit * pmu; | ||
379 | struct MessageUnit_A __iomem * pmuA; | 370 | struct MessageUnit_A __iomem * pmuA; |
380 | struct MessageUnit_B * pmuB; | 371 | struct MessageUnit_B * pmuB; |
381 | }; | 372 | }; |