diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-19 08:22:57 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-19 08:22:57 +0100 |
| commit | 0ff555192a8d20385d49d1c420e2e8d409b3c0da (patch) | |
| tree | b6e4b6cae1028a310a3488ebf745954c51694bfc /sound/core/init.c | |
| parent | 3218c178b41b420cb7e0d120c7a137a3969242e5 (diff) | |
| parent | 9e43f0de690211cf7153b5f3ec251bc315647ada (diff) | |
| download | op-kernel-dev-0ff555192a8d20385d49d1c420e2e8d409b3c0da.zip op-kernel-dev-0ff555192a8d20385d49d1c420e2e8d409b3c0da.tar.gz | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/core/init.c')
| -rw-r--r-- | sound/core/init.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 8af467d..b47ff8b 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -264,8 +264,11 @@ static int snd_disconnect_release(struct inode *inode, struct file *file) } spin_unlock(&shutdown_lock); - if (likely(df)) + if (likely(df)) { + if ((file->f_flags & FASYNC) && df->disconnected_f_op->fasync) + df->disconnected_f_op->fasync(-1, file, 0); return df->disconnected_f_op->release(inode, file); + } panic("%s(%p, %p) failed!", __func__, inode, file); } @@ -549,9 +552,9 @@ int snd_card_register(struct snd_card *card) return -EINVAL; #ifndef CONFIG_SYSFS_DEPRECATED if (!card->card_dev) { - card->card_dev = device_create_drvdata(sound_class, card->dev, - MKDEV(0, 0), NULL, - "card%i", card->number); + card->card_dev = device_create(sound_class, card->dev, + MKDEV(0, 0), NULL, + "card%i", card->number); if (IS_ERR(card->card_dev)) card->card_dev = NULL; } |
