patch-2.3.30 linux/drivers/usb/ohci-root-hub.c

Next file: linux/drivers/usb/proc_usb.c
Previous file: linux/drivers/usb/ohci-hcd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.29/linux/drivers/usb/ohci-root-hub.c linux/drivers/usb/ohci-root-hub.c
@@ -205,7 +205,7 @@
 					len = min(leni, min(sizeof(root_hub_config_des), wLength));
 					memcpy(data, root_hub_config_des, len); OK(len);
 				case (0x03): /* string descriptors */
-				default:
+				default: OK(-4);
 			}
 			break;
 		
@@ -229,13 +229,15 @@
 		case RH_GET_CONFIGURATION: 	*(__u8 *)data = 0x01; OK(1);
 
 		case RH_SET_CONFIGURATION: 	WR_RH_STAT( 0x10000); OK(0);
+
+		default: OK(-4);
 	}
 	
 	OHCI_DEBUG(printk("USB HC roothubstat1: %x \n", readl( &(ohci->regs->roothub.portstatus[0]) ));)
 	OHCI_DEBUG(printk("USB HC roothubstat2: %x \n", readl( &(ohci->regs->roothub.portstatus[1]) ));)
   		
 	
-	return req_reply;
+	return len;
 }
 
 /* prepare Interrupt pipe transaction data; HUB INTERRUPT ENDPOINT */ 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)