projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge series "regulator: mp886x: two features and dt json convert" from Jisheng Zhang...
[linux-2.6-microblaze.git]
/
sound
/
usb
/
usbaudio.h
diff --git
a/sound/usb/usbaudio.h
b/sound/usb/usbaudio.h
index
1c892c7
..
b91c4c0
100644
(file)
--- a/
sound/usb/usbaudio.h
+++ b/
sound/usb/usbaudio.h
@@
-19,14
+19,16
@@
struct media_device;
struct media_intf_devnode;
struct media_device;
struct media_intf_devnode;
+#define MAX_CARD_INTERFACES 16
+
struct snd_usb_audio {
int index;
struct usb_device *dev;
struct snd_card *card;
struct snd_usb_audio {
int index;
struct usb_device *dev;
struct snd_card *card;
- struct usb_interface *
pm_intf
;
+ struct usb_interface *
intf[MAX_CARD_INTERFACES]
;
u32 usb_id;
struct mutex mutex;
u32 usb_id;
struct mutex mutex;
- unsigned int
autosuspended:1;
+ unsigned int
system_suspend;
atomic_t active;
atomic_t shutdown;
atomic_t usage_count;
atomic_t active;
atomic_t shutdown;
atomic_t usage_count;