From: Tom Yan Date: Tue, 12 Jul 2016 18:54:11 +0000 (+0800) Subject: libata-scsi: fix D_SENSE bit relection in control mode page X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c9cd3504eb03755db8e64f894ccd4ebee59734b7;p=linux-beck.git libata-scsi: fix D_SENSE bit relection in control mode page The bit should always be set to 1 when the requested version of page is "changeable" because we've made it so in ata_mselect_control(). Also, it should always be set to 1 if ATA_DFLAG_D_SENSE is set (when the requested version of page is "current" or "default"). Signed-off-by: Tom Yan Signed-off-by: Tejun Heo --- diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index f6888fca4b5f..9c7c9f28ac23 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -2451,7 +2451,7 @@ static unsigned int ata_msense_ctl_mode(struct ata_device *dev, u8 *buf, bool changeable) { modecpy(buf, def_control_mpage, sizeof(def_control_mpage), changeable); - if (changeable && (dev->flags & ATA_DFLAG_D_SENSE)) + if (changeable || (dev->flags & ATA_DFLAG_D_SENSE)) buf[2] |= (1 << 2); /* Descriptor sense requested */ return sizeof(def_control_mpage); }