xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'topic/snd_card_new-err' into topic/asoc

Browse Source 
Conflicts:
	sound/soc/soc-core.c
This commit is contained in:
Takashi Iwai
2009-01-28 08:08:32 +01:00
parent 006f367e38 b1a0aac05f
commit 67fcdead3c
111 changed files with 617 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/sound/core.h
View File

@@ -296,8 +296,20 @@ int snd_card_locked(int card);
extern int (*snd_mixer_oss_notify_callback)(struct snd_card *card, int cmd);
#endif
int snd_card_create(int idx, const char *id,
struct module *module, int extra_size,
struct snd_card **card_ret);
static inline __deprecated
struct snd_card *snd_card_new(int idx, const char *id,
struct module *module, int extra_size);
struct module *module, int extra_size)
{
struct snd_card *card;
if (snd_card_create(idx, id, module, extra_size, &card) < 0)
return NULL;
return card;
}
int snd_card_disconnect(struct snd_card *card);
int snd_card_free(struct snd_card *card);
int snd_card_free_when_closed(struct snd_card *card);