Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / drivers / scsi / libsas / sas_ata.c

diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index a4811e4106dffcafdb4215ad5505af4f85d912ae..744f06d04a363225cc9859b08df208a2cb0156ae 100644 (file)
--- 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)
                /* incomplete response */
                SAS_DPRINTK("sending SET FEATURE/PUP_STBY_SPIN_UP to "
                            "dev %llx\n", SAS_ADDR(dev->sas_addr));
-               if (!le16_to_cpu(identify_x[83] & (1<<6)))
+               if (!(identify_x[83] & cpu_to_le16(1<<6)))
                        goto cont1;
                res = sas_issue_ata_cmd(dev, ATA_SET_FEATURES,
                                        ATA_FEATURE_PUP_STBY_SPIN_UP,