aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/dmasound/dmasound_awacs.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index 37773b1deea5..f8a49bd17a13 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -257,7 +257,7 @@ static volatile struct dbdma_cmd *emergency_dbdma_cmd;
257/* 257/*
258 * Stuff for restoring after a sleep. 258 * Stuff for restoring after a sleep.
259 */ 259 */
260static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when); 260static void awacs_sleep_notify(struct pmu_sleep_notifier *self, int when);
261struct pmu_sleep_notifier awacs_sleep_notifier = { 261struct pmu_sleep_notifier awacs_sleep_notifier = {
262 awacs_sleep_notify, SLEEP_LEVEL_SOUND, 262 awacs_sleep_notify, SLEEP_LEVEL_SOUND,
263}; 263};
@@ -1419,7 +1419,7 @@ load_awacs(void)
1419 * Save state when going to sleep, restore it afterwards. 1419 * Save state when going to sleep, restore it afterwards.
1420 */ 1420 */
1421/* FIXME: sort out disabling/re-enabling of read stuff as well */ 1421/* FIXME: sort out disabling/re-enabling of read stuff as well */
1422static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when) 1422static void awacs_sleep_notify(struct pmu_sleep_notifier *self, int when)
1423{ 1423{
1424 unsigned long flags; 1424 unsigned long flags;
1425 1425
@@ -1548,7 +1548,6 @@ static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when)
1548 spin_unlock_irqrestore(&dmasound.lock, flags); 1548 spin_unlock_irqrestore(&dmasound.lock, flags);
1549 UNLOCK(); 1549 UNLOCK();
1550 } 1550 }
1551 return PBOOK_SLEEP_OK;
1552} 1551}
1553#endif /* CONFIG_PM */ 1552#endif /* CONFIG_PM */
1554 1553