diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-11-19 11:30:48 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-11-19 11:30:48 -0500 |
| commit | bc0bad8583e9e8d068e911abf95486cda6255140 (patch) | |
| tree | 88df0397634674192b49c21b53d3162c418c8606 /include/sound/core.h | |
| parent | aba4db3afbef038fc3462c718f1fb6adf6607602 (diff) | |
| parent | 155e05410f861fda0042d1e6dc5b1b7944c4c85a (diff) | |
Merge tag 'v3.2.34' into v3.2-rt
This is the 3.2.34 stable release
Diffstat (limited to 'include/sound/core.h')
| -rw-r--r-- | include/sound/core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index 3be5ab782b99..222f11eb191e 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -132,6 +132,7 @@ struct snd_card { int shutdown; /* this card is going down */ int free_on_last_close; /* free in context of file_release */ wait_queue_head_t shutdown_sleep; + atomic_t refcount; /* refcount for disconnection */ struct device *dev; /* device assigned to this card */ struct device *card_dev; /* cardX object for sysfs */ @@ -189,6 +190,7 @@ struct snd_minor { const struct file_operations *f_ops; /* file operations */ void *private_data; /* private data for f_ops->open */ struct device *dev; /* device for sysfs */ + struct snd_card *card_ptr; /* assigned card instance */ }; /* return a device pointer linked to each sound device as a parent */ @@ -295,6 +297,7 @@ int snd_card_info_done(void); int snd_component_add(struct snd_card *card, const char *component); int snd_card_file_add(struct snd_card *card, struct file *file); int snd_card_file_remove(struct snd_card *card, struct file *file); +void snd_card_unref(struct snd_card *card); #define snd_card_set_dev(card, devptr) ((card)->dev = (devptr)) |