Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3e8ded0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull hwmon fix from Guenter Roeck:
 "Fix root cause of crash/error seen in applesmc driver"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (applesmc) Always read until end of data
parents 2d9d0282 25f2bd7f

drivers/hwmon/applesmc.c

+13 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ static int send_argument(const char *key) 


static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len)

{

	u8 status, data = 0;

	int i;



	if (send_command(cmd) || send_argument(key)) {
@@ -237,6 +238,7 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) 
		return -EIO;

	}



	/* This has no effect on newer (2012) SMCs */

	if (send_byte(len, APPLESMC_DATA_PORT)) {

		pr_warn("%.4s: read len fail\n", key);

		return -EIO;
@@ -250,6 +252,17 @@ static int read_smc(u8 cmd, const char *key, u8 *buffer, u8 len) 
		buffer[i] = inb(APPLESMC_DATA_PORT);

	}



	/* Read the data port until bit0 is cleared */

	for (i = 0; i < 16; i++) {

		udelay(APPLESMC_MIN_WAIT);

		status = inb(APPLESMC_CMD_PORT);

		if (!(status & 0x01))

			break;

		data = inb(APPLESMC_DATA_PORT);

	}

	if (i)

		pr_warn("flushed %d bytes, last value is: %d\n", i, data);



	return 0;

}