diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2009-01-05 10:53:58 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-05 10:53:58 +0100 |
| commit | cd8faac38c1c4ff2b404d808f6c623ab47e06475 (patch) | |
| tree | 554666b304cfe5c650be3fd857cfdfe7b1f9cae3 /sound/usb/usbmixer.c | |
| parent | Merge branch 'topic/hda' into for-linus (diff) | |
| parent | ALSA: sound/usb: Use negated usb_endpoint_xfer_control, etc (diff) | |
| download | linux-dev-cd8faac38c1c4ff2b404d808f6c623ab47e06475.tar.xz linux-dev-cd8faac38c1c4ff2b404d808f6c623ab47e06475.zip | |
Merge branch 'topic/usbaudio' into for-linus
Diffstat (limited to 'sound/usb/usbmixer.c')
| -rw-r--r-- | sound/usb/usbmixer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/usb/usbmixer.c b/sound/usb/usbmixer.c index a49246113e75..00397c8a765b 100644 --- a/sound/usb/usbmixer.c +++ b/sound/usb/usbmixer.c @@ -1755,11 +1755,10 @@ static int snd_usb_mixer_status_create(struct usb_mixer_interface *mixer) if (get_iface_desc(hostif)->bNumEndpoints < 1) return 0; ep = get_endpoint(hostif, 0); - if ((ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK) != USB_DIR_IN || - (ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_INT) + if (!usb_endpoint_dir_in(ep) || !usb_endpoint_xfer_int(ep)) return 0; - epnum = ep->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK; + epnum = usb_endpoint_num(ep); buffer_length = le16_to_cpu(ep->wMaxPacketSize); transfer_buffer = kmalloc(buffer_length, GFP_KERNEL); if (!transfer_buffer) |