hwmon: (s3c-hwmon) Ignore invalid divider settings
authorBen Dooks <ben@simtec.co.uk>
Mon, 16 Nov 2009 11:45:39 +0000 (12:45 +0100)
committerJean Delvare <khali@linux-fr.org>
Mon, 16 Nov 2009 11:45:39 +0000 (12:45 +0100)
Avoid registering channels that have zero divider settings in them, as this
will only lead to kernel OOPS from divide-by-zero when the sysfs entry is
read.

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
drivers/hwmon/s3c-hwmon.c

index 3a524f2fe49352af9b6a8acd869d2ed5a2abc5e9..71835412529fca92dd4964dc28c95c6c749162be 100644 (file)
@@ -323,14 +323,21 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev)
        }
 
        for (i = 0; i < ARRAY_SIZE(pdata->in); i++) {
-               if (!pdata->in[i])
+               struct s3c24xx_adc_hwmon_incfg *cfg = pdata->in[i];
+
+               if (!cfg)
                        continue;
 
-               if (pdata->in[i]->mult >= 0x10000)
+               if (cfg->mult >= 0x10000)
                        dev_warn(&dev->dev,
                                 "channel %d multiplier too large\n",
                                 i);
 
+               if (cfg->divider == 0) {
+                       dev_err(&dev->dev, "channel %d divider zero\n", i);
+                       continue;
+               }
+
                ret = s3c_hwmon_create_attr(&dev->dev, pdata->in[i],
                                            &hwmon->attrs[i], i);
                if (ret) {