diff options
Diffstat (limited to 'sound/oss/cs46xx.c')
-rw-r--r-- | sound/oss/cs46xx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c index 6e3c41f530e6..147c8a951137 100644 --- a/sound/oss/cs46xx.c +++ b/sound/oss/cs46xx.c | |||
@@ -91,6 +91,7 @@ | |||
91 | #include <linux/poll.h> | 91 | #include <linux/poll.h> |
92 | #include <linux/ac97_codec.h> | 92 | #include <linux/ac97_codec.h> |
93 | #include <linux/mutex.h> | 93 | #include <linux/mutex.h> |
94 | #include <linux/mm.h> | ||
94 | 95 | ||
95 | #include <asm/io.h> | 96 | #include <asm/io.h> |
96 | #include <asm/dma.h> | 97 | #include <asm/dma.h> |
@@ -779,7 +780,7 @@ static unsigned int cs_set_adc_rate(struct cs_state *state, unsigned int rate) | |||
779 | rate = 48000 / 9; | 780 | rate = 48000 / 9; |
780 | 781 | ||
781 | /* | 782 | /* |
782 | * We can not capture at at rate greater than the Input Rate (48000). | 783 | * We cannot capture at at rate greater than the Input Rate (48000). |
783 | * Return an error if an attempt is made to stray outside that limit. | 784 | * Return an error if an attempt is made to stray outside that limit. |
784 | */ | 785 | */ |
785 | if (rate > 48000) | 786 | if (rate > 48000) |
@@ -4754,8 +4755,8 @@ static int cs_hardware_init(struct cs_card *card) | |||
4754 | mdelay(5 * cs_laptop_wait); /* Shouldnt be needed ?? */ | 4755 | mdelay(5 * cs_laptop_wait); /* Shouldnt be needed ?? */ |
4755 | 4756 | ||
4756 | /* | 4757 | /* |
4757 | * If we are resuming under 2.2.x then we can not schedule a timeout. | 4758 | * If we are resuming under 2.2.x then we cannot schedule a timeout, |
4758 | * so, just spin the CPU. | 4759 | * so just spin the CPU. |
4759 | */ | 4760 | */ |
4760 | if (card->pm.flags & CS46XX_PM_IDLE) { | 4761 | if (card->pm.flags & CS46XX_PM_IDLE) { |
4761 | /* | 4762 | /* |