diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-09-06 18:52:54 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-09-06 18:52:54 -0400 |
| commit | 17fa53da1239b8712c5cebbd72a74c713b6c2db9 (patch) | |
| tree | 8cf55e47ce681a6c899ccf8e06abeccecb20d38b /drivers/scsi/aacraid | |
| parent | 3173d8c342971a03857d8af749a3f57da7d06b57 (diff) | |
| parent | fe1b2d544d71300f8e2d151c3c77a130d13a58be (diff) | |
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) | |||
| 972 | fibsize = sizeof(struct aac_read64) + | 972 | fibsize = sizeof(struct aac_read64) + |
| 973 | ((le32_to_cpu(readcmd->sg.count) - 1) * | 973 | ((le32_to_cpu(readcmd->sg.count) - 1) * |
| 974 | sizeof (struct sgentry64)); | 974 | sizeof (struct sgentry64)); |
| 975 | BUG_ON (fibsize > (sizeof(struct hw_fib) - | 975 | BUG_ON (fibsize > (dev->max_fib_size - |
| 976 | sizeof(struct aac_fibhdr))); | 976 | sizeof(struct aac_fibhdr))); |
| 977 | /* | 977 | /* |
| 978 | * Now send the Fib to the adapter | 978 | * Now send the Fib to the adapter |