diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:43:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:43:10 -0500 |
| commit | 590cf28580c999c8ba70dc39b40bab09d69e2630 (patch) | |
| tree | 22b9aa4b148bea8a310b760521d1032eef7d743f /drivers/ata | |
| parent | f54a6ec0fd85002d94d05b4bb679508eeb066683 (diff) | |
| parent | fb5edd020fa0fbe991f4a473611ad530d2237425 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (104 commits)
[SCSI] fcoe: fix configuration problems
[SCSI] cxgb3i: fix select/depend problem
[SCSI] fcoe: fix incorrect use of struct module
[SCSI] cxgb3i: remove use of skb->sp
[SCSI] cxgb3i: Add cxgb3i iSCSI driver.
[SCSI] zfcp: Remove unnecessary warning message
[SCSI] zfcp: Add support for unchained FSF requests
[SCSI] zfcp: Remove busid macro
[SCSI] zfcp: remove DID_DID flag
[SCSI] zfcp: Simplify mask lookups for incoming RSCNs
[SCSI] zfcp: Remove initial device data from zfcp_data
[SCSI] zfcp: fix compile warning
[SCSI] zfcp: Remove adapter list
[SCSI] zfcp: Simplify SBAL allocation to fix sparse warnings
[SCSI] zfcp: register with SCSI layer on ccw registration
[SCSI] zfcp: Fix message line break
[SCSI] qla2xxx: changes in multiq code
[SCSI] eata: fix the data buffer accessors conversion regression
[SCSI] ibmvfc: Improve async event handling
[SCSI] lpfc : correct printk types on PPC compiles
...
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 0b2e14f67655..4040d8b53216 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
| @@ -517,7 +517,7 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg) | |||
| 517 | /* Good values for timeout and retries? Values below | 517 | /* Good values for timeout and retries? Values below |
| 518 | from scsi_ioctl_send_command() for default case... */ | 518 | from scsi_ioctl_send_command() for default case... */ |
| 519 | cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize, | 519 | cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize, |
| 520 | sensebuf, (10*HZ), 5, 0); | 520 | sensebuf, (10*HZ), 5, 0, NULL); |
| 521 | 521 | ||
| 522 | if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */ | 522 | if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */ |
| 523 | u8 *desc = sensebuf + 8; | 523 | u8 *desc = sensebuf + 8; |
| @@ -603,7 +603,7 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg) | |||
| 603 | /* Good values for timeout and retries? Values below | 603 | /* Good values for timeout and retries? Values below |
| 604 | from scsi_ioctl_send_command() for default case... */ | 604 | from scsi_ioctl_send_command() for default case... */ |
| 605 | cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0, | 605 | cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0, |
| 606 | sensebuf, (10*HZ), 5, 0); | 606 | sensebuf, (10*HZ), 5, 0, NULL); |
| 607 | 607 | ||
| 608 | if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */ | 608 | if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */ |
| 609 | u8 *desc = sensebuf + 8; | 609 | u8 *desc = sensebuf + 8; |