mpc8641hpcn: Use physical address in flash banks defintion

[oweals/u-boot.git] / drivers / usb / usbdcore_ep0.c

diff --git a/drivers/usb/usbdcore_ep0.c b/drivers/usb/usbdcore_ep0.c
index 1e44f322a7977513630df0011ec852e6f0351750..f6e017df1804dc9409fc774cec36031d3318c4df 100644 (file)
--- a/drivers/usb/usbdcore_ep0.c
+++ b/drivers/usb/usbdcore_ep0.c
@@ -51,8 +51,6 @@
  */
 
 #include <common.h>
-
-#if defined(CONFIG_USB_DEVICE)
 #include "usbdcore.h"
 
 #if 0
@@ -235,8 +233,8 @@ static int ep0_get_descriptor (struct usb_device_instance *device,
                                return -1;
                        }
                        /*dbg_ep0(2, "%d %d", index, device_descriptor->bNumConfigurations); */
-                       if (index > device_descriptor->bNumConfigurations) {
-                               dbg_ep0 (0, "index too large: %d > %d", index,
+                       if (index >= device_descriptor->bNumConfigurations) {
+                               dbg_ep0 (0, "index too large: %d >= %d", index,
                                         device_descriptor->
                                         bNumConfigurations);
                                return -1;
@@ -571,14 +569,8 @@ int ep0_recv_setup (struct urb *urb)
 
                case USB_REQ_SET_CONFIGURATION:
                        /* c.f. 9.4.7 - the top half of wValue is reserved */
-                       /* */
-                       if ((device->configuration =
-                               le16_to_cpu (request->wValue) & 0xFF80) != 0) {
-                               /* c.f. 9.4.7 - zero is the default or addressed state, in our case this */
-                               /* is the same is configuration zero */
-                               serial_printf("error setting dev->config to zero!\n");
-                               device->configuration = 0;      /* TBR - ?????? */
-                       }
+                       device->configuration = le16_to_cpu(request->wValue) & 0xff;
+
                        /* reset interface and alternate settings */
                        device->interface = device->alternate = 0;
 
@@ -603,5 +595,3 @@ int ep0_recv_setup (struct urb *urb)
        }
        return -1;
 }
-
-#endif