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
This commit is contained in:
commit
d71f058617
1 changed files with 1 additions and 0 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue