Re: [PATCH] USB and Driver Core patches for 2.6.10

Greg KH
2005-01-08T06:49:15Z

ChangeSet 1.1938.446.17, 2004/12/15 16:33:30-08:00, david-b@pacbell.net

[PATCH] USB: auerswald and usb_dev->ep[] (5/15)

Update the auerswald driver to stop using the now-vanished
usb_epnum_to_ep_desc() function.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

drivers/usb/misc/auerswald.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)

diff -Nru a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
--- a/drivers/usb/misc/auerswald.c 2005-01-07 15:49:22 -08:00
+++ b/drivers/usb/misc/auerswald.c 2005-01-07 15:49:22 -08:00
@@ -1123,16 +1123,16 @@
static int auerswald_int_open (pauerswald_t cp)
{
int ret;
- struct usb_endpoint_descriptor *ep;
+ struct usb_host_endpoint *ep;
int irqsize;
dbg ("auerswald_int_open");

- ep = usb_epnum_to_ep_desc (cp->usbdev, USB_DIR_IN | AU_IRQENDP);
+ ep = cp->usbdev->ep_in[AU_IRQENDP];
if (!ep) {
ret = -EFAULT;
goto intoend;
}
- irqsize = ep->wMaxPacketSize;
+ irqsize = ep->desc.wMaxPacketSize;
cp->irqsize = irqsize;

/* allocate the urb and data buffer */
@@ -1151,7 +1151,9 @@
}
}
/* setup urb */
- usb_fill_int_urb (cp->inturbp, cp->usbdev, usb_rcvintpipe (cp->usbdev,AU_IRQENDP), cp->intbufp, irqsize, auerswald_int_complete, cp, ep->bInterval);
+ usb_fill_int_urb (cp->inturbp, cp->usbdev,
+ usb_rcvintpipe (cp->usbdev,AU_IRQENDP), cp->intbufp,
+ irqsize, auerswald_int_complete, cp, ep->desc.bInterval);
/* start the urb */
cp->inturbp->status = 0; /* needed! */
ret = usb_submit_urb (cp->inturbp, GFP_KERNEL);