summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-01-28 08:08:32 +0100
committerTakashi Iwai <tiwai@suse.de>2009-01-28 08:08:32 +0100
commit67fcdead3c7424d51e7108c220c9ab1a5e752ed3 (patch)
tree3c48fabced8e519ef3f83209a793dfea48dbbfa8 /include/sound
parent006f367e38fb45e2f161c0f500c74449ae63e866 (diff)
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff)
downloadblackbird-op-linux-67fcdead3c7424d51e7108c220c9ab1a5e752ed3.tar.gz
blackbird-op-linux-67fcdead3c7424d51e7108c220c9ab1a5e752ed3.zip
Merge branch 'topic/snd_card_new-err' into topic/asoc
Conflicts: sound/soc/soc-core.c
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/core.h14
1 files changed, 13 insertions, 1 deletions
diff --git a/include/sound/core.h b/include/sound/core.h
index f632484bc743..25420c3b5513 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -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);
OpenPOWER on IntegriCloud