diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-07 21:28:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-07 21:28:26 -0700 |
| commit | d71f058617564750261b673ea9b3352382b9cde4 (patch) | |
| tree | 3601abf4d9de3be03509fe2a7293d4c07c9ab2ff | |
| parent | 80a77045daacc660659093b312ca0708b53ed558 (diff) | |
| parent | 87260d3f7aecba9a5fadc6886c338b2a8fccfca9 (diff) | |
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal fix from Zhang Rui:
"Only one patch this time, which fixes a crash in rcar_thermal driver.
From Dirk Behme"
* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: rcar_thermal: Fix priv->zone error handling
| -rw-r--r-- | drivers/thermal/rcar_thermal.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c index 71a339271fa5..5f817923f374 100644 --- a/drivers/thermal/rcar_thermal.c +++ b/drivers/thermal/rcar_thermal.c @@ -504,6 +504,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; } |