diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-09-07 00:52:54 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-09-07 00:52:54 +0200 |
| commit | 17fa53da1239b8712c5cebbd72a74c713b6c2db9 (patch) | |
| tree | 8cf55e47ce681a6c899ccf8e06abeccecb20d38b /drivers/scsi/aacraid | |
| parent | [SCSI] quieten messages on scsi_execute commands (diff) | |
| parent | [SCSI] unexport scsi_add_timer/scsi_delete_timer (diff) | |
| download | linux-17fa53da1239b8712c5cebbd72a74c713b6c2db9.tar.xz linux-17fa53da1239b8712c5cebbd72a74c713b6c2db9.zip | |
Merge by hand (conflicts in sd.c)
Diffstat (limited to 'drivers/scsi/aacraid')
| -rw-r--r-- | drivers/scsi/aacraid/aachba.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aacraid/aachba.c b/drivers/scsi/aacraid/aachba.c index 83bfab73ff65..a8e3dfcd0dc7 100644 --- a/drivers/scsi/aacraid/aachba.c +++ b/drivers/scsi/aacraid/aachba.c @@ -972,7 +972,7 @@ static int aac_read(struct scsi_cmnd * scsicmd, int cid) fibsize = sizeof(struct aac_read64) + ((le32_to_cpu(readcmd->sg.count) - 1) * sizeof (struct sgentry64)); - BUG_ON (fibsize > (sizeof(struct hw_fib) - + BUG_ON (fibsize > (dev->max_fib_size - sizeof(struct aac_fibhdr))); /* * Now send the Fib to the adapter |