diff options
| author | Xin Xie <xxie@nvidia.com> | 2013-04-17 14:33:17 -0700 |
|---|---|---|
| committer | Mrutyunjay Sawant <msawant@nvidia.com> | 2013-04-24 07:37:11 -0700 |
| commit | 533655ced3011c4c4176217967cb0f2adcfd56cc (patch) | |
| tree | 93611aec25dd1a9c72202ffad967cfe92801f206 /drivers/power/max77665-charger.c | |
| parent | ebc132f810b295951f5aad0b0b271000dffb0164 (diff) | |
power: max77665: fix temperature reading
We are using 0xFF as error code for temperature reading, but 0xFF is also
25.5c which is a legal temperature reading.
Fix this issue by using dedicated error code return value.
bug 1236790
Change-Id: Ic0be2909ec10ce5763f77dc6ec30a7c6bc5d9d03
Signed-off-by: Xin Xie <xxie@nvidia.com>
Reviewed-on: http://git-master/r/220786
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Syed Rafiuddin <srafiuddin@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Diffstat (limited to 'drivers/power/max77665-charger.c')
| -rw-r--r-- | drivers/power/max77665-charger.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/power/max77665-charger.c b/drivers/power/max77665-charger.c index c311ac4aef66..9faa5ceb72c7 100644 --- a/drivers/power/max77665-charger.c +++ b/drivers/power/max77665-charger.c @@ -815,6 +815,7 @@ static __devinit int max77665_battery_probe(struct platform_device *pdev) uint8_t j; uint32_t read_val; struct max77665_charger *charger; + int temp; charger = devm_kzalloc(&pdev->dev, sizeof(*charger), GFP_KERNEL); if (!charger) { @@ -852,11 +853,11 @@ static __devinit int max77665_battery_probe(struct platform_device *pdev) } /* differentiate between E1236 and E1587*/ - ret = maxim_get_temp(); - if (ret == 0xff) { + ret = maxim_get_temp(&temp); + if (ret < 0) { dev_err(&pdev->dev, "failed in reading temperaure\n"); goto remove_charging; - } else if ((ret < MIN_TEMP) || (ret > MAX_TEMP)) { + } else if ((temp < MIN_TEMP) || (temp > MAX_TEMP)) { dev_err(&pdev->dev, "E1236 detected exiting driver....\n"); goto remove_charging; } |