diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
| commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
| tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /drivers/scsi/ch.c | |
| parent | e12f0102ac81d660c9f801d0a0e10ccf4537a9de (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'drivers/scsi/ch.c')
| -rw-r--r-- | drivers/scsi/ch.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c index 88ecf94ad979..af9725409f43 100644 --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c | |||
| @@ -190,7 +190,7 @@ ch_do_scsi(scsi_changer *ch, unsigned char *cmd, | |||
| 190 | 190 | ||
| 191 | result = scsi_execute_req(ch->device, cmd, direction, buffer, | 191 | result = scsi_execute_req(ch->device, cmd, direction, buffer, |
| 192 | buflength, &sshdr, timeout * HZ, | 192 | buflength, &sshdr, timeout * HZ, |
| 193 | MAX_RETRIES); | 193 | MAX_RETRIES, NULL); |
| 194 | 194 | ||
| 195 | dprintk("result: 0x%x\n",result); | 195 | dprintk("result: 0x%x\n",result); |
| 196 | if (driver_byte(result) & DRIVER_SENSE) { | 196 | if (driver_byte(result) & DRIVER_SENSE) { |