Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 339289
b: refs/heads/master
c: d12250e
h: refs/heads/master
i:
  339287: b625dab
v: v3
  • Loading branch information
Kuninori Morimoto authored and Zhang Rui committed Nov 26, 2012
1 parent 7f4370d commit 7fa07a6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c499703e64bef8f2e8ffe9ea7ee63a0a926b5530
refs/heads/master: d12250ef8dc1bbc811d505776be053e358ba82f5
3 changes: 2 additions & 1 deletion trunk/drivers/thermal/rcar_thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ struct rcar_thermal_priv {
};

#define MCELSIUS(temp) ((temp) * 1000)
#define rcar_zone_to_priv(zone) (zone->devdata)

/*
* basic functions
Expand Down Expand Up @@ -98,7 +99,7 @@ static void rcar_thermal_bset(struct rcar_thermal_priv *priv, u32 reg,
static int rcar_thermal_get_temp(struct thermal_zone_device *zone,
unsigned long *temp)
{
struct rcar_thermal_priv *priv = zone->devdata;
struct rcar_thermal_priv *priv = rcar_zone_to_priv(zone);
int val, min, max, tmp;

tmp = -200; /* default */
Expand Down

0 comments on commit 7fa07a6

Please sign in to comment.