瀏覽代碼

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 <tom.ty89@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Tom Yan 9 年之前
父節點
當前提交
c9cd3504eb
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      drivers/ata/libata-scsi.c

+ 1 - 1
drivers/ata/libata-scsi.c

@@ -2451,7 +2451,7 @@ static unsigned int ata_msense_ctl_mode(struct ata_device *dev, u8 *buf,
 					bool changeable)
 					bool changeable)
 {
 {
 	modecpy(buf, def_control_mpage, sizeof(def_control_mpage), 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 */
 		buf[2] |= (1 << 2);	/* Descriptor sense requested */
 	return sizeof(def_control_mpage);
 	return sizeof(def_control_mpage);
 }
 }