| From 1748cbf7f7c464593232cde914f5a103181a83b5 Mon Sep 17 00:00:00 2001 |
| From: Sangjung Woo <sangjung.woo@samsung.com> |
| Date: Wed, 11 Sep 2013 14:24:21 -0700 |
| Subject: drivers/rtc/rtc-max77686.c: Fix wrong register |
| |
| From: Sangjung Woo <sangjung.woo@samsung.com> |
| |
| commit 1748cbf7f7c464593232cde914f5a103181a83b5 upstream. |
| |
| Fix a read of the wrong register when checking whether the RTC timer has |
| reached the alarm time. |
| |
| Signed-off-by: Sangjung Woo <sangjung.woo@samsung.com> |
| Signed-off-by: Myugnjoo Ham <myungjoo.ham@samsung.com> |
| Reviewed-by: Jonghwa Lee <jonghwa3.lee@samsung.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/rtc/rtc-max77686.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/rtc/rtc-max77686.c |
| +++ b/drivers/rtc/rtc-max77686.c |
| @@ -240,9 +240,9 @@ static int max77686_rtc_read_alarm(struc |
| } |
| |
| alrm->pending = 0; |
| - ret = regmap_read(info->max77686->regmap, MAX77686_REG_STATUS1, &val); |
| + ret = regmap_read(info->max77686->regmap, MAX77686_REG_STATUS2, &val); |
| if (ret < 0) { |
| - dev_err(info->dev, "%s:%d fail to read status1 reg(%d)\n", |
| + dev_err(info->dev, "%s:%d fail to read status2 reg(%d)\n", |
| __func__, __LINE__, ret); |
| goto out; |
| } |