diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 17:16:30 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 17:16:30 +1100 |
| commit | 1e43bee9c70654b4d52472c19e5f0a0cc18b6b36 (patch) | |
| tree | ff601ec0c0d14125d0324f21b3c7e6d5e19fa252 /drivers/hwmon/s3c-hwmon.c | |
| parent | 7d6709a20866a885916214590b7c394a21be9e25 (diff) | |
| parent | a8a8a669ea13d792296737505adc43ccacf3a648 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/hwmon/s3c-hwmon.c')
| -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 3a524f2fe49..71835412529 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) { |