diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 14:25:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 14:25:31 -0400 |
| commit | 2cca775baecbfede2fec20c99add709232311fe7 (patch) | |
| tree | b0eefe80881d263ba7976174144ae4e9cf238425 /drivers/scsi/libsas/sas_ata.c | |
| parent | eddeb0e2d863e3941d8768e70cb50c6120e61fa0 (diff) | |
| parent | 94795b61e84994a3b058f92d041d1fb3d869c7d5 (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: (137 commits)
[SCSI] iscsi: bidi support for iscsi_tcp
[SCSI] iscsi: bidi support at the generic libiscsi level
[SCSI] iscsi: extended cdb support
[SCSI] zfcp: Fix error handling for blocked unit for send FCP command
[SCSI] zfcp: Remove zfcp_erp_wait from slave destory handler to fix deadlock
[SCSI] zfcp: fix 31 bit compile warnings
[SCSI] bsg: no need to set BSG_F_BLOCK bit in bsg_complete_all_commands
[SCSI] bsg: remove minor in struct bsg_device
[SCSI] bsg: use better helper list functions
[SCSI] bsg: replace kobject_get with blk_get_queue
[SCSI] bsg: takes a ref to struct device in fops->open
[SCSI] qla1280: remove version check
[SCSI] libsas: fix endianness bug in sas_ata
[SCSI] zfcp: fix compiler warning caused by poking inside new semaphore (linux-next)
[SCSI] aacraid: Do not describe check_reset parameter with its value
[SCSI] aacraid: Fix down_interruptible() to check the return value
[SCSI] sun3_scsi_vme: add MODULE_LICENSE
[SCSI] st: rename flush_write_buffer()
[SCSI] tgt: use KMEM_CACHE macro
[SCSI] initio: fix big endian problems for auto request sense
...
Diffstat (limited to 'drivers/scsi/libsas/sas_ata.c')
| -rw-r--r-- | drivers/scsi/libsas/sas_ata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index a4811e4106df..744f06d04a36 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c | |||
| @@ -691,7 +691,7 @@ static int sas_discover_sata_dev(struct domain_device *dev) | |||
| 691 | /* incomplete response */ | 691 | /* incomplete response */ |
| 692 | SAS_DPRINTK("sending SET FEATURE/PUP_STBY_SPIN_UP to " | 692 | SAS_DPRINTK("sending SET FEATURE/PUP_STBY_SPIN_UP to " |
| 693 | "dev %llx\n", SAS_ADDR(dev->sas_addr)); | 693 | "dev %llx\n", SAS_ADDR(dev->sas_addr)); |
| 694 | if (!le16_to_cpu(identify_x[83] & (1<<6))) | 694 | if (!(identify_x[83] & cpu_to_le16(1<<6))) |
| 695 | goto cont1; | 695 | goto cont1; |
| 696 | res = sas_issue_ata_cmd(dev, ATA_SET_FEATURES, | 696 | res = sas_issue_ata_cmd(dev, ATA_SET_FEATURES, |
| 697 | ATA_FEATURE_PUP_STBY_SPIN_UP, | 697 | ATA_FEATURE_PUP_STBY_SPIN_UP, |