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

Commit 9d54e2c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (asc7621) Add X58 entry in Kconfig
  hwmon: (w83793) Saving negative errors in unsigned
  hwmon: (coretemp) Add missing newline to dev_warn() message
  hwmon: (coretemp) Fix cpu model output
parents 7b128872 b00d8a7e

drivers/hwmon/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -217,8 +217,8 @@ config SENSORS_ASC7621 
	depends on HWMON && I2C

	help

	  If you say yes here you get support for the aSC7621

	  family of SMBus sensors chip found on most Intel X48, X38, 975,

	  965 and 945 desktop boards.  Currently supported chips:

	  family of SMBus sensors chip found on most Intel X38, X48, X58,

	  945, 965 and 975 desktop boards.  Currently supported chips:

	  aSC7621

	  aSC7621a

drivers/hwmon/coretemp.c

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device * 
		if (err) {

			dev_warn(dev,

				 "Unable to access MSR 0xEE, for Tjmax, left"

				 " at default");

				 " at default\n");

		} else if (eax & 0x40000000) {

			tjmax = tjmax_ee;

		}
@@ -466,7 +466,7 @@ static int __init coretemp_init(void) 
			   family 6 CPU */

			if ((c->x86 == 0x6) && (c->x86_model > 0xf))

				printk(KERN_WARNING DRVNAME ": Unknown CPU "

					"model %x\n", c->x86_model);

					"model 0x%x\n", c->x86_model);

			continue;

		}

drivers/hwmon/w83793.c

+1 −1
Original line number Diff line number Diff line
@@ -1294,7 +1294,7 @@ static int watchdog_close(struct inode *inode, struct file *filp) 
static ssize_t watchdog_write(struct file *filp, const char __user *buf,

	size_t count, loff_t *offset)

{

	size_t ret;

	ssize_t ret;

	struct w83793_data *data = filp->private_data;



	if (count) {