summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-19 10:22:14 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-19 10:22:14 +0100
commita5e0e970c06065a14844b406a0c2a59776a1ccc6 (patch)
tree1da3f4aac02e29f0dfbd099b17412011ca950cb8 /include
parent6ce6c473a7fd742fdb0db95841e2c4c6b37337c5 (diff)
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff)
downloadop-kernel-dev-a5e0e970c06065a14844b406a0c2a59776a1ccc6.zip
op-kernel-dev-a5e0e970c06065a14844b406a0c2a59776a1ccc6.tar.gz
Merge branch 'topic/snd_card_new-err' into topic/oxygen
Diffstat (limited to 'include')
-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 f632484..25420c3 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