Skip to content

Commit b62cef9

Browse files
committed
Merge tag 'hwmon-for-v6.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fix from Guenter Roeck: "One patch to fix error handling in drivetemp driver" * tag 'hwmon-for-v6.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (drivetemp) Fix driver producing garbage data when SCSI errors occur
2 parents 05c2d1f + 82163d6 commit b62cef9

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/hwmon/drivetemp.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ static int drivetemp_scsi_command(struct drivetemp_data *st,
165165
{
166166
u8 scsi_cmd[MAX_COMMAND_SIZE];
167167
enum req_op op;
168+
int err;
168169

169170
memset(scsi_cmd, 0, sizeof(scsi_cmd));
170171
scsi_cmd[0] = ATA_16;
@@ -192,8 +193,11 @@ static int drivetemp_scsi_command(struct drivetemp_data *st,
192193
scsi_cmd[12] = lba_high;
193194
scsi_cmd[14] = ata_command;
194195

195-
return scsi_execute_cmd(st->sdev, scsi_cmd, op, st->smartdata,
196-
ATA_SECT_SIZE, HZ, 5, NULL);
196+
err = scsi_execute_cmd(st->sdev, scsi_cmd, op, st->smartdata,
197+
ATA_SECT_SIZE, HZ, 5, NULL);
198+
if (err > 0)
199+
err = -EIO;
200+
return err;
197201
}
198202

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

0 commit comments

Comments
 (0)