diff options
author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-07-06 16:25:55 +0200 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-07-06 16:25:55 +0200 |
commit | ea1a25c3348abc33d7d94db28501766adf3d1c7d (patch) | |
tree | ca3c5c8b72532117034dd2d57a2a85eead13db7b /drivers/rtc/rtc-snvs.c | |
parent | SCSI: fix new bug in scsi_dev_info_list string matching (diff) | |
parent | qla2xxx: Fix NULL pointer deref in QLA interrupt (diff) | |
download | linux-ea1a25c3348abc33d7d94db28501766adf3d1c7d.tar.xz linux-ea1a25c3348abc33d7d94db28501766adf3d1c7d.zip |
Merge branch 'jejb-fixes' into fixes
Diffstat (limited to 'drivers/rtc/rtc-snvs.c')
-rw-r--r-- | drivers/rtc/rtc-snvs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-snvs.c b/drivers/rtc/rtc-snvs.c index 950c5d0b6dca..0f11c2a228e3 100644 --- a/drivers/rtc/rtc-snvs.c +++ b/drivers/rtc/rtc-snvs.c @@ -322,7 +322,7 @@ static int snvs_rtc_suspend(struct device *dev) struct snvs_rtc_data *data = dev_get_drvdata(dev); if (device_may_wakeup(dev)) - enable_irq_wake(data->irq); + return enable_irq_wake(data->irq); return 0; } |