1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index d3181967f167..a10a380868e2 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -116,7 +116,7 @@ struct smsc47m1_data {
         unsigned short addr;
         const char *name;
         enum chips type;
-        struct class_device *class_dev;
+        struct device *hwmon_dev;
 
         struct mutex update_lock;
         unsigned long last_updated;     /* In jiffies */
@@ -553,7 +553,7 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
                  || (err = device_create_file(dev,
                                 &sensor_dev_attr_fan3_div.dev_attr)))
                         goto error_remove_files;
-        } else
+        } else if (data->type == smsc47m2)
                 dev_dbg(dev, "Fan 3 not enabled by hardware, skipping\n");
 
         if (pwm1) {
@@ -580,7 +580,7 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
                  || (err = device_create_file(dev,
                                 &sensor_dev_attr_pwm3_enable.dev_attr)))
                         goto error_remove_files;
-        } else
+        } else if (data->type == smsc47m2)
                 dev_dbg(dev, "PWM 3 not enabled by hardware, skipping\n");
 
         if ((err = device_create_file(dev, &dev_attr_alarms)))
@@ -588,9 +588,9 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
         if ((err = device_create_file(dev, &dev_attr_name)))
                 goto error_remove_files;
 
-        data->class_dev = hwmon_device_register(dev);
-        if (IS_ERR(data->class_dev)) {
-                err = PTR_ERR(data->class_dev);
+        data->hwmon_dev = hwmon_device_register(dev);
+        if (IS_ERR(data->hwmon_dev)) {
+                err = PTR_ERR(data->hwmon_dev);
                 goto error_remove_files;
         }
 
@@ -611,7 +611,7 @@ static int __devexit smsc47m1_remove(struct platform_device *pdev)
         struct smsc47m1_data *data = platform_get_drvdata(pdev);
         struct resource *res;
 
-        hwmon_device_unregister(data->class_dev);
+        hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&pdev->dev.kobj, &smsc47m1_group);
 
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);