From b60863d5fd91bce469b880d8ae17326e70fa7777 Mon Sep 17 00:00:00 2001 From: Eduardo Valentin Date: Tue, 13 Nov 2012 14:10:01 -0400 Subject: [PATCH] --- yaml --- r: 337846 b: refs/heads/master c: 5041949117e3c1a0b7c21c3b176ca18b202d4027 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/omap-thermal/omap-thermal-common.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 793f68ece6b7..dc7d4cb53aad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2aeeb8acfc19f8a9f283081bbf77919b61b92042 +refs/heads/master: 5041949117e3c1a0b7c21c3b176ca18b202d4027 diff --git a/trunk/drivers/staging/omap-thermal/omap-thermal-common.c b/trunk/drivers/staging/omap-thermal/omap-thermal-common.c index 5c0c203b887f..5be66d7f5d21 100644 --- a/trunk/drivers/staging/omap-thermal/omap-thermal-common.c +++ b/trunk/drivers/staging/omap-thermal/omap-thermal-common.c @@ -256,12 +256,12 @@ static struct omap_thermal_data int omap_thermal_expose_sensor(struct omap_bandgap *bg_ptr, int id, char *domain) { - struct omap_thermal_pdata pdata; + struct omap_thermal_data *data; data = omap_bandgap_get_sensor_data(bg_ptr, id); if (!data) - data = omap_thermal_build_pdata(bg_ptr, id); + data = omap_thermal_build_data(bg_ptr, id); if (!data) return -EINVAL; @@ -359,7 +359,7 @@ int omap_thermal_register_cpu_cooling(struct omap_bandgap *bg_ptr, int id) data = omap_bandgap_get_sensor_data(bg_ptr, id); if (!data) - data = omap_thermal_build_pdata(bg_ptr, id); + data = omap_thermal_build_data(bg_ptr, id); if (!data) return -EINVAL;