From 1860ba2c9f059b3b392ec8bb7bb29081d93a8807 Mon Sep 17 00:00:00 2001 From: Eduardo Valentin Date: Tue, 11 Sep 2012 19:06:54 +0300 Subject: [PATCH] --- yaml --- r: 325160 b: refs/heads/master c: 765a1939a364d121e70b452c3df34c2af446f47a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/omap-thermal/omap-thermal-common.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3a4c5d6b833d..421d1f3a0230 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cff860f5faa318bfb4a1549e0fa03d2c3c6cbe57 +refs/heads/master: 765a1939a364d121e70b452c3df34c2af446f47a diff --git a/trunk/drivers/staging/omap-thermal/omap-thermal-common.c b/trunk/drivers/staging/omap-thermal/omap-thermal-common.c index 0675a5e2f7c8..d15642487008 100644 --- a/trunk/drivers/staging/omap-thermal/omap-thermal-common.c +++ b/trunk/drivers/staging/omap-thermal/omap-thermal-common.c @@ -246,7 +246,9 @@ int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id, /* Create thermal zone */ data->omap_thermal = thermal_zone_device_register(domain, OMAP_TRIP_NUMBER, 0, data, &omap_thermal_ops, - 0, FAST_TEMP_MONITORING_RATE, 0, 0); + 1, 2, /*TODO: remove this when FW allows */ + FAST_TEMP_MONITORING_RATE, + FAST_TEMP_MONITORING_RATE); if (IS_ERR_OR_NULL(data->omap_thermal)) { dev_err(bg_ptr->dev, "thermal zone device is NULL\n"); return PTR_ERR(data->omap_thermal);