diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-03-31 00:55:14 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-03-31 00:55:14 -0400 |
| commit | 3595be778d8cb887f0e0575ef0a0c1a094d120bb (patch) | |
| tree | 15671ed8bd3597d2efe13aa57b755c66014acb57 /drivers/rtc/rtc-at91sam9.c | |
| parent | c414a117c6094c3f86b533f97beaf45ef9075f03 (diff) | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
Merge branch 'v2.6.34-rc2' into drm-linus
Diffstat (limited to 'drivers/rtc/rtc-at91sam9.c')
| -rw-r--r-- | drivers/rtc/rtc-at91sam9.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c index 86c61f143515..78a018b5c941 100644 --- a/drivers/rtc/rtc-at91sam9.c +++ b/drivers/rtc/rtc-at91sam9.c | |||
| @@ -161,7 +161,7 @@ static int at91_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm) | |||
| 161 | if (offset == 0) | 161 | if (offset == 0) |
| 162 | return -EILSEQ; | 162 | return -EILSEQ; |
| 163 | 163 | ||
| 164 | memset(alrm, 0, sizeof(alrm)); | 164 | memset(alrm, 0, sizeof(*alrm)); |
| 165 | if (alarm != ALARM_DISABLED && offset != 0) { | 165 | if (alarm != ALARM_DISABLED && offset != 0) { |
| 166 | rtc_time_to_tm(offset + alarm, tm); | 166 | rtc_time_to_tm(offset + alarm, tm); |
| 167 | 167 | ||