evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (fschmd) Fix a memleak on multiple opens of /dev/watchdog
  hwmon: (asus_atk0110) Do not fail if MBIF is missing
  hwmon: (amc6821) Double unlock bug
  hwmon: (smsc47m1) Fix section mismatch
This commit is contained in:
Linus Torvalds 2010-01-25 19:00:56 -08:00
commit c799d15333
4 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/hwmon/amc6821.c
View file

@ -686,7 +686,6 @@ static ssize_t set_fan1_div(
data->fan1_div = 4; data->fan1_div = 4;
break; break;
default: default:
mutex_unlock(&data->update_lock);
count = -EINVAL; count = -EINVAL;
goto EXIT; goto EXIT;
} }

19
drivers/hwmon/asus_atk0110.c
View file

@ -1329,18 +1329,17 @@ static int atk_add(struct acpi_device *device)
&buf, ACPI_TYPE_PACKAGE); &buf, ACPI_TYPE_PACKAGE);
if (ret != AE_OK) { if (ret != AE_OK) {
dev_dbg(&device->dev, "atk: method MBIF not found\n"); dev_dbg(&device->dev, "atk: method MBIF not found\n");
err = -ENODEV; } else {
goto out; obj = buf.pointer;
if (obj->package.count >= 2) {
union acpi_object *id = &obj->package.elements[1];
if (id->type == ACPI_TYPE_STRING)
dev_dbg(&device->dev, "board ID = %s\n",
id->string.pointer);
}
ACPI_FREE(buf.pointer);
} }
obj = buf.pointer;
if (obj->package.count >= 2 &&
obj->package.elements[1].type == ACPI_TYPE_STRING) {
dev_dbg(&device->dev, "board ID = %s\n",
obj->package.elements[1].string.pointer);
}
ACPI_FREE(buf.pointer);
err = atk_probe_if(data); err = atk_probe_if(data);
if (err) { if (err) {
dev_err(&device->dev, "No usable hwmon interface detected\n"); dev_err(&device->dev, "No usable hwmon interface detected\n");

7
drivers/hwmon/fschmd.c
View file

@ -768,6 +768,7 @@ leave:
static int watchdog_open(struct inode *inode, struct file *filp) static int watchdog_open(struct inode *inode, struct file *filp)
{ {
struct fschmd_data *pos, *data = NULL; struct fschmd_data *pos, *data = NULL;
int watchdog_is_open;
/* We get called from drivers/char/misc.c with misc_mtx hold, and we /* We get called from drivers/char/misc.c with misc_mtx hold, and we
call misc_register() from fschmd_probe() with watchdog_data_mutex call misc_register() from fschmd_probe() with watchdog_data_mutex
@ -782,10 +783,12 @@ static int watchdog_open(struct inode *inode, struct file *filp)
} }
} }
/* Note we can never not have found data, so we don't check for this */ /* Note we can never not have found data, so we don't check for this */
kref_get(&data->kref); watchdog_is_open = test_and_set_bit(0, &data->watchdog_is_open);
if (!watchdog_is_open)
kref_get(&data->kref);
mutex_unlock(&watchdog_data_mutex); mutex_unlock(&watchdog_data_mutex);
if (test_and_set_bit(0, &data->watchdog_is_open)) if (watchdog_is_open)
return -EBUSY; return -EBUSY;
/* Start the watchdog */ /* Start the watchdog */

2
drivers/hwmon/smsc47m1.c
View file

@ -488,7 +488,7 @@ static int __init smsc47m1_find(unsigned short *addr,
} }
/* Restore device to its initial state */ /* Restore device to its initial state */
static void __init smsc47m1_restore(const struct smsc47m1_sio_data *sio_data) static void smsc47m1_restore(const struct smsc47m1_sio_data *sio_data)
{ {
if ((sio_data->activate & 0x01) == 0) { if ((sio_data->activate & 0x01) == 0) {
superio_enter(); superio_enter();