From fb6cc905e958369003ac4bd089476b15b32e873e Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Wed, 20 Mar 2013 15:52:00 +0000
Subject: [PATCH] --- yaml --- r: 363643 b: refs/heads/master c:
 3465a22488a47d5f4791876a22fde2bb1720f4cf h: refs/heads/master i:   363641:
 b4f2d05ef45fd515f61f585fe68bfed0ef81a03b   363639:
 778fa249ef77717a9b17a95f02fd08429cb5914d v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/iio/iio_hwmon.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b8530afbf4d0..c026fb742573 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb916ebbeabd18f7dc3c661275d2c9d343f4fa85
+refs/heads/master: 3465a22488a47d5f4791876a22fde2bb1720f4cf
diff --git a/trunk/drivers/staging/iio/iio_hwmon.c b/trunk/drivers/staging/iio/iio_hwmon.c
index 93af756ba48c..aafa4531b961 100644
--- a/trunk/drivers/staging/iio/iio_hwmon.c
+++ b/trunk/drivers/staging/iio/iio_hwmon.c
@@ -13,6 +13,7 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/hwmon.h>
+#include <linux/of.h>
 #include <linux/hwmon-sysfs.h>
 #include <linux/iio/consumer.h>
 #include <linux/iio/types.h>
@@ -58,7 +59,12 @@ static ssize_t iio_hwmon_read_val(struct device *dev,
 static ssize_t show_name(struct device *dev, struct device_attribute *attr,
 			 char *buf)
 {
-	return sprintf(buf, "iio_hwmon\n");
+	const char *name = "iio_hwmon";
+
+	if (dev->of_node && dev->of_node->name)
+		name = dev->of_node->name;
+
+	return sprintf(buf, "%s\n", name);
 }
 
 static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);