diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 17:06:53 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 20:18:25 -0700 |
| commit | 5257a97a86766bdc3a976e3278b65367f35f9ff8 (patch) | |
| tree | 4c2f54480001df75745bdfbf9b9f1ccbe71a3199 /drivers/rtc | |
| parent | ca43de58e5c35310fef81a64e0854615595935ee (diff) | |
| parent | 410dbb746130bc052bb3c7a337a86252874adbdf (diff) | |
Merge tag 'v3.10.12' into android-tegra-nv-3.10-rebase
This is the 3.10.12 stable release
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-max77686.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c index 771812d62e6b..3bb9401f1cae 100644 --- a/drivers/rtc/rtc-max77686.c +++ b/drivers/rtc/rtc-max77686.c @@ -240,9 +240,9 @@ static int max77686_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) } 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; } |