hwmon fixes for v6.13-rc7

One patch to fix error handling in drivetemp driver.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEiHPvMQj9QTOCiqgVyx8mb86fmYEFAmeCwOAACgkQyx8mb86f
 mYE5nA/9ETHc1WkRdgppF0FkcjuW9/GUfHlPgKG3yydT26k1ftlRncQxTXRRyONK
 oUidhlnM91Zu/xYlYHlDxVMPdiYVu7DFgB42TgREIjMCBBvZNux8HN0WI+KcpWXB
 JBGeCyoLrN/58TvClqC1jiblaZJkdjGZ7kQntdSqUsq4x09goCKDrslpcbfDb4Ja
 DI6vtkpNR3MvmU+o9wkcq5yAYtsJiQP0+qwjUuYzxbRbSNVAz8S0KmIiaZrOj+g+
 IGpNAIFNDgMbYD3iAXV0O8v7UkOlXXl0gLH6smQSQ5pYVlw0KrTRv0hAn6py8iLy
 oGA27WLkybooWYMwC4joMu40zQq/Rw3BRUhBy8sXZa6D2l543Rjc19r6vf7zIsra
 Hqarf8WgWbE1eYe7PxGzGDXQnVsp0sDRaqapdJfnuEUeZi488haMS2sSQLjYWSwp
 wjz0FVdDuFJf7pLB5EjWWghq4q2+pyseQsWfcvvJzRohD/fMW1ImdOhHfDR1l9um
 AwzrW16Nl4RGtahreYn7MeRkzVnUIRzuhuF+OLT/RbNqwBGBHKqwjJMOu/86Um3Y
 pfGnG0XRnHfnPFk2WZqqTADYFDumh7ljBbuaazJn22Yd1F+oqJ8uPv45GbHmxZl7
 Td5TH6PLpPRHh3X0tqmUrEx95tK6hlsLWASVfoUNklvelGsfJoI=
 =0Dqd
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2025-01-11 11:42:48 -08:00
commit b62cef9a5c

View File

@ -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,
ATA_SECT_SIZE, HZ, 5, NULL);
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,