ALSA CVS update - Jaroslav Kysela <perex@suse.cz>

USB generic driver
Returned back get_iface() macro for quirks
Removed extra variable to avoid warning

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index 6b33beedf355e6687681f0fe23f6f7a4717aa35e..4969b5118c293a954fe79f5c9e411aa66a45fa2a 100644 (file)
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -1074,7 +1074,6 @@ static int init_usb_sample_rate(struct usb_device *dev, int iface,
 static int set_format(snd_usb_substream_t *subs, struct audioformat *fmt)
 {
        struct usb_device *dev = subs->dev;
-       struct usb_host_config *config = dev->actconfig;
        struct usb_host_interface *alts;
        struct usb_interface_descriptor *altsd;
        struct usb_interface *iface;

diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h
index 96e404811555fccec8d1eb0a5993be9dab323a72..d26075663cc45bd29f43081701b752b9ece184c4 100644 (file)
--- a/sound/usb/usbaudio.h
+++ b/sound/usb/usbaudio.h
@@ -207,6 +207,7 @@ void snd_usbmidi_disconnect(struct list_head *p, struct usb_driver *driver);
  * (conditional for compatibility with the older API)
  */
 #ifndef get_iface_desc
+#define get_iface(cfg, num)    ((cfg)->interface[(num)])
 #define get_iface_desc(iface)  (&(iface)->desc)
 #define get_endpoint(alt,ep)   (&(alt)->endpoint[ep].desc)
 #define get_ep_desc(ep)                (&(ep)->desc)