From: Guenter Roeck <linux@roeck-us.net>
Date: Tue, 31 Jan 2017 11:56:08 +0000 (-0800)
Subject: hwmon: Register thermal zone only if 'dev' parameter was provided
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=319fe159889a06b47a2621a1201c813502b7a842;p=openwrt%2Fstaging%2Fblogic.git

hwmon: Register thermal zone only if 'dev' parameter was provided

Rgistering a thermal zone uses devm_kzalloc(), which requires
a pointer to the parent device.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---

diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index 9a02c452f9e5..28375d59cc36 100644
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -608,7 +608,7 @@ __hwmon_device_register(struct device *dev, const char *name, void *drvdata,
 	if (err)
 		goto free_hwmon;
 
-	if (chip && chip->ops->read &&
+	if (dev && chip && chip->ops->read &&
 	    chip->info[0]->type == hwmon_chip &&
 	    (chip->info[0]->config[0] & HWMON_C_REGISTER_TZ)) {
 		const struct hwmon_channel_info **info = chip->info;