git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: Avoid endless sleep after disconnect
[pandora-kernel.git]
/
sound
/
core
/
oss
/
pcm_oss.c
diff --git
a/sound/core/oss/pcm_oss.c
b/sound/core/oss/pcm_oss.c
index
23c34a0
..
408f815
100644
(file)
--- a/
sound/core/oss/pcm_oss.c
+++ b/
sound/core/oss/pcm_oss.c
@@
-30,7
+30,7
@@
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/vmalloc.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/vmalloc.h>
-#include <linux/module
param
.h>
+#include <linux/module.h>
#include <linux/math64.h>
#include <linux/string.h>
#include <sound/core.h>
#include <linux/math64.h>
#include <linux/string.h>
#include <sound/core.h>
@@
-2441,6
+2441,10
@@
static int snd_pcm_oss_open(struct inode *inode, struct file *file)
mutex_unlock(&pcm->open_mutex);
schedule();
mutex_lock(&pcm->open_mutex);
mutex_unlock(&pcm->open_mutex);
schedule();
mutex_lock(&pcm->open_mutex);
+ if (pcm->card->shutdown) {
+ err = -ENODEV;
+ break;
+ }
if (signal_pending(current)) {
err = -ERESTARTSYS;
break;
if (signal_pending(current)) {
err = -ERESTARTSYS;
break;
@@
-2457,6
+2461,8
@@
static int snd_pcm_oss_open(struct inode *inode, struct file *file)
__error2:
snd_card_file_remove(pcm->card, file);
__error1:
__error2:
snd_card_file_remove(pcm->card, file);
__error1:
+ if (pcm)
+ snd_card_unref(pcm->card);
return err;
}
return err;
}