diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:14:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:14:29 -0500 |
| commit | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (patch) | |
| tree | 639c536e818c6ace974aa285ba94576df0353b01 /drivers/scsi/ch.c | |
| parent | 7a51cffbd10886c0557677dd916c090097c691ef (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'linus' into tracing/kmemtrace
Conflicts:
mm/slub.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) { |