diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 01:16:30 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 01:16:30 -0500 |
| 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 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) | |||
| 323 | } | 323 | } |
| 324 | 324 | ||
| 325 | for (i = 0; i < ARRAY_SIZE(pdata->in); i++) { | 325 | for (i = 0; i < ARRAY_SIZE(pdata->in); i++) { |
| 326 | if (!pdata->in[i]) | 326 | struct s3c24xx_adc_hwmon_incfg *cfg = pdata->in[i]; |
| 327 | |||
| 328 | if (!cfg) | ||
| 327 | continue; | 329 | continue; |
| 328 | 330 | ||
| 329 | if (pdata->in[i]->mult >= 0x10000) | 331 | if (cfg->mult >= 0x10000) |
| 330 | dev_warn(&dev->dev, | 332 | dev_warn(&dev->dev, |
| 331 | "channel %d multiplier too large\n", | 333 | "channel %d multiplier too large\n", |
| 332 | i); | 334 | i); |
| 333 | 335 | ||
| 336 | if (cfg->divider == 0) { | ||
| 337 | dev_err(&dev->dev, "channel %d divider zero\n", i); | ||
| 338 | continue; | ||
| 339 | } | ||
| 340 | |||
| 334 | ret = s3c_hwmon_create_attr(&dev->dev, pdata->in[i], | 341 | ret = s3c_hwmon_create_attr(&dev->dev, pdata->in[i], |
| 335 | &hwmon->attrs[i], i); | 342 | &hwmon->attrs[i], i); |
| 336 | if (ret) { | 343 | if (ret) { |