Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / sound / usb / misc / ua101.c

diff --git a/sound/usb/misc/ua101.c b/sound/usb/misc/ua101.c
index 9581089c28c5e5300930476ee16774543095ed74..c19a5dd056317128f3fbc9e2b02dc4f775454c6b 100644 (file)
--- a/sound/usb/misc/ua101.c
+++ b/sound/usb/misc/ua101.c
@@ -1037,7 +1037,7 @@ static int detect_usb_format(struct ua101 *ua)
                return -ENXIO;
        }
        ua->capture.usb_pipe = usb_rcvisocpipe(ua->dev, usb_endpoint_num(epd));
-       ua->capture.max_packet_bytes = le16_to_cpu(epd->wMaxPacketSize);
+       ua->capture.max_packet_bytes = usb_endpoint_maxp(epd);
 
        epd = &ua->intf[INTF_PLAYBACK]->altsetting[1].endpoint[0].desc;
        if (!usb_endpoint_is_isoc_out(epd)) {
@@ -1045,7 +1045,7 @@ static int detect_usb_format(struct ua101 *ua)
                return -ENXIO;
        }
        ua->playback.usb_pipe = usb_sndisocpipe(ua->dev, usb_endpoint_num(epd));
-       ua->playback.max_packet_bytes = le16_to_cpu(epd->wMaxPacketSize);
+       ua->playback.max_packet_bytes = usb_endpoint_maxp(epd);
        return 0;
 }