summaryrefslogtreecommitdiff
path: root/ANDROID_3.4.5/sound/core/control.c
diff options
context:
space:
mode:
Diffstat (limited to 'ANDROID_3.4.5/sound/core/control.c')
-rw-r--r--ANDROID_3.4.5/sound/core/control.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/ANDROID_3.4.5/sound/core/control.c b/ANDROID_3.4.5/sound/core/control.c
index 2487a6bb..daa4fc88 100644
--- a/ANDROID_3.4.5/sound/core/control.c
+++ b/ANDROID_3.4.5/sound/core/control.c
@@ -86,6 +86,7 @@ static int snd_ctl_open(struct inode *inode, struct file *file)
write_lock_irqsave(&card->ctl_files_rwlock, flags);
list_add_tail(&ctl->list, &card->ctl_files);
write_unlock_irqrestore(&card->ctl_files_rwlock, flags);
+ snd_card_unref(card);
return 0;
__error:
@@ -93,6 +94,8 @@ static int snd_ctl_open(struct inode *inode, struct file *file)
__error2:
snd_card_file_remove(card, file);
__error1:
+ if (card)
+ snd_card_unref(card);
return err;
}
@@ -1433,6 +1436,8 @@ static ssize_t snd_ctl_read(struct file *file, char __user *buffer,
spin_unlock_irq(&ctl->read_lock);
schedule();
remove_wait_queue(&ctl->change_sleep, &wait);
+ if (ctl->card->shutdown)
+ return -ENODEV;
if (signal_pending(current))
return -ERESTARTSYS;
spin_lock_irq(&ctl->read_lock);