Unverified Commit 7c834950 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15144 hwmon: (drivetemp) Fix driver producing garbage data when SCSI errors occur 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Ridong <chenridong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/72IIUEYM222POCGY6WLZ5TU2GG3N76JU/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBJ6R2 
 
Link:https://gitee.com/openeuler/kernel/pulls/15144

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents e740234d a02b4525

drivers/hwmon/drivetemp.c

+6 −2
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ static int drivetemp_scsi_command(struct drivetemp_data *st, 
{

	u8 scsi_cmd[MAX_COMMAND_SIZE];

	enum req_op op;

	int err;



	memset(scsi_cmd, 0, sizeof(scsi_cmd));

	scsi_cmd[0] = ATA_16;
@@ -192,8 +193,11 @@ static int drivetemp_scsi_command(struct drivetemp_data *st, 
	scsi_cmd[12] = lba_high;

	scsi_cmd[14] = ata_command;



	return scsi_execute_cmd(st->sdev, scsi_cmd, op, st->smartdata,

	err = scsi_execute_cmd(st->sdev, scsi_cmd, op, st->smartdata,

			       ATA_SECT_SIZE, HZ, 5, NULL);

	if (err > 0)

		err = -EIO;

	return err;

}



static int drivetemp_ata_command(struct drivetemp_data *st, u8 feature,