projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[linux-2.6-microblaze.git]
/
drivers
/
thermal
/
rcar_thermal.c
diff --git
a/drivers/thermal/rcar_thermal.c
b/drivers/thermal/rcar_thermal.c
index
6c73d3e
..
73e5fee
100644
(file)
--- a/
drivers/thermal/rcar_thermal.c
+++ b/
drivers/thermal/rcar_thermal.c
@@
-511,6
+511,7
@@
static int rcar_thermal_probe(struct platform_device *pdev)
if (IS_ERR(priv->zone)) {
dev_err(dev, "can't register thermal zone\n");
ret = PTR_ERR(priv->zone);
+ priv->zone = NULL;
goto error_unregister;
}