Merge with Linu 2.4.0-test6-pre6.

6 files changed, 18 insertions, 11 deletions

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 3598dc269..5831dd1d9 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -14,7 +14,6 @@ ALL_SUB_DIRS	:= $(SUB_DIRS) serial storage
 O_TARGET	:= usbdrv.o
 M_OBJS		:=
 O_OBJS		:=
-MOD_LIST_NAME	:= USB_MODULES
 
 # Objects that export symbols.
 
diff --git a/drivers/usb/ibmcam.c b/drivers/usb/ibmcam.c
index 6b85a15f0..86360f687 100644
--- a/drivers/usb/ibmcam.c
+++ b/drivers/usb/ibmcam.c
@@ -205,8 +205,10 @@ static inline unsigned long uvirt_to_kva(pgd_t *pgd, unsigned long adr)
 		if (!pmd_none(*pmd)) {
 			ptep = pte_offset(pmd, adr);
 			pte = *ptep;
-			if (pte_present(pte))
-				ret = page_address(pte_page(pte)) | (adr & (PAGE_SIZE-1));
+			if (pte_present(pte)) {
+				ret = (unsigned long) page_address(pte_page(pte));
+				ret |= (adr & (PAGE_SIZE - 1));
+			}
 		}
 	}
 	MDEBUG(printk("uv2kva(%lx-->%lx)", adr, ret));
diff --git a/drivers/usb/ov511.c b/drivers/usb/ov511.c
index 73e3a5be1..055099a0c 100644
--- a/drivers/usb/ov511.c
+++ b/drivers/usb/ov511.c
@@ -207,9 +207,10 @@ static inline unsigned long uvirt_to_kva(pgd_t *pgd, unsigned long adr)
 		if (!pmd_none(*pmd)) {
 			ptep = pte_offset(pmd, adr);
 			pte = *ptep;
-			if (pte_present(pte))
-				ret = page_address(pte_page(pte)) |
-				      (adr & (PAGE_SIZE-1));
+			if (pte_present(pte)) {
+				ret = (unsigned long) page_address(pte_page(pte));
+				ret |= (adr & (PAGE_SIZE - 1));
+			}
 		}
 	}
 
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index 31f913ff9..ce5d7b128 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -5,7 +5,6 @@
 O_TARGET	:= usb-serial.o
 M_OBJS		:=
 O_OBJS		:=
-MOD_LIST_NAME	:= USB_SERIAL_MODULES
 
 # Object file lists.
 
diff --git a/drivers/usb/storage/Makefile b/drivers/usb/storage/Makefile
index 1b204ab28..7da59f78e 100644
--- a/drivers/usb/storage/Makefile
+++ b/drivers/usb/storage/Makefile
@@ -5,7 +5,6 @@
 O_TARGET	:= usb-storage.o
 M_OBJS		:= usb-storage.o
 O_OBJS		:= scsiglue.o protocol.o transport.o usb.o 
-MOD_LIST_NAME	:= USB_STORAGE_MODULES
 
 CFLAGS_scsiglue.o:= -I../../scsi/
 CFLAGS_protocol.o:= -I../../scsi/
diff --git a/drivers/usb/usb-ohci.c b/drivers/usb/usb-ohci.c
index cfa871503..367f0d3f6 100644
--- a/drivers/usb/usb-ohci.c
+++ b/drivers/usb/usb-ohci.c
@@ -960,13 +960,20 @@ static ed_t * ep_add_ed (struct usb_device * usb_dev, unsigned int pipe, int int
 	ed = ed_ret = &(usb_to_ohci (usb_dev)->ed[(usb_pipeendpoint (pipe) << 1) | 
 			(usb_pipecontrol (pipe)? 0: usb_pipeout (pipe))]);
 
-	if((ed->state & ED_DEL) || (ed->state & ED_URB_DEL)) 
-		return NULL; /* pending delete request */
+	if ((ed->state & ED_DEL) || (ed->state & ED_URB_DEL)) {
+		/* pending delete request */
+		spin_unlock (&usb_ed_lock);
+		return NULL;
+	}
 	
 	if (ed->state == ED_NEW) {
 		ed->hwINFO = cpu_to_le32 (OHCI_ED_SKIP); /* skip ed */
   		OHCI_ALLOC (td, sizeof (*td)); /* dummy td; end of td list for ed */
-  		if(!td) return NULL; /* out of memory */
+  		if (!td) {
+			/* out of memory */
+			spin_unlock (&usb_ed_lock);
+			return NULL;
+		}
 		ed->hwTailP = cpu_to_le32 (virt_to_bus (td));
 		ed->hwHeadP = ed->hwTailP;	
 		ed->state = ED_UNLINK;