[PATCH] USB: usb-storage bugfix

Don't try to dereference the interrupt endpoint if it doesn't exist.

[PATCH] USB: usb-storage bugfix
Don't try to dereference the interrupt endpoint if it doesn't exist.
0d1e2e6a · Alan Stern · Greg Kroah-Hartman · e5ccffb2 · 0d1e2e6a
Commit 0d1e2e6a authored Dec 17, 2002 by Alan Stern Committed by Greg Kroah-Hartman Dec 17, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 6 deletions

drivers/usb/storage/usb.c drivers/usb/storage/usb.c +14 -6

No files found.
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -728,9 +728,13 @@ static int storage_probe(struct usb_interface *intf,
 			USB_ENDPOINT_NUMBER_MASK;
 		ss->ep_out = ep_out->bEndpointAddress & 
 			USB_ENDPOINT_NUMBER_MASK;
-		ss->ep_int = ep_int->bEndpointAddress & 
+		if (ep_int) {
-			USB_ENDPOINT_NUMBER_MASK;
+			ss->ep_int = ep_int->bEndpointAddress & 
-		ss->ep_bInterval = ep_int->bInterval;
+				USB_ENDPOINT_NUMBER_MASK;
+			ss->ep_bInterval = ep_int->bInterval;
+		}
+		else
+			ss->ep_int = ss->ep_bInterval = 0;
 		/* allocate the URB, the usb_ctrlrequest, and the IRQ URB */
 		if (usb_stor_allocate_urbs(ss))
@@ -771,9 +775,13 @@ static int storage_probe(struct usb_interface *intf,
 			USB_ENDPOINT_NUMBER_MASK;
 		ss->ep_out = ep_out->bEndpointAddress & 
 			USB_ENDPOINT_NUMBER_MASK;
-		ss->ep_int = ep_int->bEndpointAddress & 
+		if (ep_int) {
-			USB_ENDPOINT_NUMBER_MASK;
+			ss->ep_int = ep_int->bEndpointAddress & 
-		ss->ep_bInterval = ep_int->bInterval;
+				USB_ENDPOINT_NUMBER_MASK;
+			ss->ep_bInterval = ep_int->bInterval;
+		}
+		else
+			ss->ep_int = ss->ep_bInterval = 0;
 		/* establish the connection to the new device */
 		ss->ifnum = ifnum;