diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /sound/oss/audio.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'sound/oss/audio.c')
| -rw-r--r-- | sound/oss/audio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/audio.c b/sound/oss/audio.c index b69c05b7ea7b..7df48a25c4ee 100644 --- a/sound/oss/audio.c +++ b/sound/oss/audio.c | |||
| @@ -838,7 +838,7 @@ static int dma_ioctl(int dev, unsigned int cmd, void __user *arg) | |||
| 838 | if ((err = audio_devs[dev]->d->prepare_for_input(dev, | 838 | if ((err = audio_devs[dev]->d->prepare_for_input(dev, |
| 839 | dmap_in->fragment_size, dmap_in->nbufs)) < 0) { | 839 | dmap_in->fragment_size, dmap_in->nbufs)) < 0) { |
| 840 | spin_unlock_irqrestore(&dmap_in->lock,flags); | 840 | spin_unlock_irqrestore(&dmap_in->lock,flags); |
| 841 | return -err; | 841 | return err; |
| 842 | } | 842 | } |
| 843 | dmap_in->dma_mode = DMODE_INPUT; | 843 | dmap_in->dma_mode = DMODE_INPUT; |
| 844 | audio_devs[dev]->enable_bits |= PCM_ENABLE_INPUT; | 844 | audio_devs[dev]->enable_bits |= PCM_ENABLE_INPUT; |