[PATCH] Fix USB address setting

You wouldn't expect that an innocent two-line patch would practically
destroy the entire functionality of the USB subsystem.  But that's what my
last patch did.  I didn't realize until I saw it in Greg's list of patches
forwarded to Linus; that patch includes a mistakenly unreverted prior
change.  This explains the problems I was having yesterday, and probably
also the problems a great many people are having today.

Anyway, here's the correction -- it puts things back to what they should
have been in the first place.  Greg, please apply this and send it to
Linus for his tree as soon as reasonably possible.

diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
index 671a87ef51454a6c33496da490fa9b979fc1f72f..a648a2d7b7f5f837bad580e36700c68cc9cacb4b 100644 (file)
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
@@ -255,8 +255,8 @@ extern void usb_destroy_configuration(struct usb_device *dev);
 extern int usb_set_address(struct usb_device *dev);
 
 /* use these only before the device's address has been set */
-#define usb_snddefctrl(dev)            ((PIPE_CONTROL << 30) | __create_pipe(dev,0))
-#define usb_rcvdefctrl(dev)            ((PIPE_CONTROL << 30) | __create_pipe(dev,0) | USB_DIR_IN)
+#define usb_snddefctrl(dev)            ((PIPE_CONTROL << 30))
+#define usb_rcvdefctrl(dev)            ((PIPE_CONTROL << 30) | USB_DIR_IN)
 
 /*-------------------------------------------------------------------------*/