diff options
| author | Tom Cherry <tcherry@nvidia.com> | 2012-05-23 12:06:13 -0700 |
|---|---|---|
| committer | Tom Cherry <tcherry@nvidia.com> | 2012-05-23 12:06:13 -0700 |
| commit | a168c03bd97fd9761218779623db0cec09fa8f4a (patch) | |
| tree | 521d2b51904da963d771c24fd9b142cc416f8259 /drivers/hwmon | |
| parent | 11fb7d0e35d56230919eb91bee1aa138a10b8416 (diff) | |
| parent | c7e3189c1802c2a6552eec960f521a1891529892 (diff) | |
Merge commit 'main-ics-2012.05.22-B3' into HEAD
Conflicts:
arch/arm/mach-tegra/pm.c
drivers/media/video/tegra/nvavp/nvavp_dev.c
drivers/power/smb349-charger.c
include/linux/smb349-charger.h
include/trace/events/power.h
Change-Id: Ia8c82e2acfe3463ae6778bdd03aac8da104f7ad3
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/tegra-tsensor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/tegra-tsensor.c b/drivers/hwmon/tegra-tsensor.c index b46603386006..28597ef4cc98 100644 --- a/drivers/hwmon/tegra-tsensor.c +++ b/drivers/hwmon/tegra-tsensor.c @@ -38,7 +38,7 @@ /* macro to enable tsensor hw reset */ /* FIXME: till tsensor temperature is reliable this should be 0 */ -#define ENABLE_TSENSOR_HW_RESET 0 +#define ENABLE_TSENSOR_HW_RESET 1 /* tsensor instance used for temperature calculation */ #define TSENSOR_FUSE_REV1 8 @@ -1542,7 +1542,7 @@ static int tsensor_within_limits(struct tegra_tsensor_data *data) static void tsensor_work_func(struct work_struct *work) { - struct tegra_tsensor_data *data = container_of(work, + struct tegra_tsensor_data *data = container_of(to_delayed_work(work), struct tegra_tsensor_data, work); if (!data->alert_func) |