summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-05 15:08:33 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-05 15:08:33 +0100
commit6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7 (patch)
tree2d6a9fdb99ddd1fb61fac029a4e04ac96e12c179 /include/sound
parent18e352e4a73465349711a9324767e1b2453383e2 (diff)
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff)
downloadop-kernel-dev-6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7.zip
op-kernel-dev-6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7.tar.gz
Merge branch 'topic/snd_card_new-err' into topic/atmel
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 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