diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-15 22:13:26 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-15 22:13:26 +0000 |
| commit | 7e1548a597ef7e26d5d62f8be3be6da9e101b26c (patch) | |
| tree | fe6cbf4d9a3c1afdba04fb276fef0f932403727c /drivers/scsi/aacraid/linit.c | |
| parent | 1f7f569c0ae6e619504095eabf796edd712d943d (diff) | |
| parent | 2619bc327417f549f1c89d5ef9b4a4aa768f41a2 (diff) | |
| download | linux-7e1548a597ef7e26d5d62f8be3be6da9e101b26c.tar.gz linux-7e1548a597ef7e26d5d62f8be3be6da9e101b26c.tar.bz2 linux-7e1548a597ef7e26d5d62f8be3be6da9e101b26c.zip | |
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Diffstat (limited to 'drivers/scsi/aacraid/linit.c')
| -rw-r--r-- | drivers/scsi/aacraid/linit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 9aa301c1ed07..162cd927d94b 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c @@ -427,8 +427,8 @@ static int aac_slave_configure(struct scsi_device *sdev) * Firmware has an individual device recovery time typically * of 35 seconds, give us a margin. */ - if (sdev->timeout < (45 * HZ)) - sdev->timeout = 45 * HZ; + if (sdev->request_queue->rq_timeout < (45 * HZ)) + blk_queue_rq_timeout(sdev->request_queue, 45*HZ); for (cid = 0; cid < aac->maximum_num_containers; ++cid) if (aac->fsa_dev[cid].valid) ++num_lsu; |