diff options
| author | Ben Dooks <ben@simtec.co.uk> | 2009-11-16 12:45:39 +0100 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2009-11-16 12:45:39 +0100 |
| commit | be4c23c93c4828d36ac9e1a88410618a61676426 (patch) | |
| tree | 2da7bc33a0b6f8fcdd43117d26d30bb479c2db2c | |
| parent | Merge git://git.infradead.org/users/dwmw2/iommu-2.6.32 (diff) | |
| download | linux-be4c23c93c4828d36ac9e1a88410618a61676426.tar.xz linux-be4c23c93c4828d36ac9e1a88410618a61676426.zip | |
hwmon: (s3c-hwmon) Ignore invalid divider settings
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>
| -rw-r--r-- | drivers/hwmon/s3c-hwmon.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/hwmon/s3c-hwmon.c b/drivers/hwmon/s3c-hwmon.c index 3a524f2fe493..71835412529f 100644 --- a/drivers/hwmon/s3c-hwmon.c +++ b/drivers/hwmon/s3c-hwmon.c @@ -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) { |