r1882 - trunk/src/target/kernel/patches

[laforge at sita.openmoko.org]

Author: laforge
Date: 2007-05-01 04:25:35 +0200 (Tue, 01 May 2007)
New Revision: 1882

Modified:
   trunk/src/target/kernel/patches/s3c2410_udc-vbus_draw_pdata.patch
Log:
vbus_draw now has 'unsigned' parameter 'ma', alter s3c2410 udc driver to comply with this.  Also make sure our vbus_draw function always returns something, even if there is no machine/platform-specific vbus_draw callback.


Modified: trunk/src/target/kernel/patches/s3c2410_udc-vbus_draw_pdata.patch
===================================================================
--- trunk/src/target/kernel/patches/s3c2410_udc-vbus_draw_pdata.patch	2007-04-30 19:22:41 UTC (rev 1881)
+++ trunk/src/target/kernel/patches/s3c2410_udc-vbus_draw_pdata.patch	2007-05-01 02:25:35 UTC (rev 1882)
@@ -6,11 +6,11 @@
 ===================================================================
 --- linux-2.6.21-moko.orig/drivers/usb/gadget/s3c2410_udc.c
 +++ linux-2.6.21-moko/drivers/usb/gadget/s3c2410_udc.c
-@@ -1404,12 +1404,23 @@
+@@ -1404,12 +1404,25 @@
  	return IRQ_HANDLED;
  }
  
-+static int s3c2410_vbus_draw(struct usb_gadget *_gadget, int ma)
++static int s3c2410_vbus_draw(struct usb_gadget *_gadget, unsigned int ma)
 +{
 +	struct s3c2410_udc  *udc;
 +
@@ -18,6 +18,8 @@
 +
 +	if (udc_info && udc_info->vbus_draw)
 +		return udc_info->vbus_draw(ma);
++	else
++		return 0;
 +}
 +
  static const struct usb_gadget_ops s3c2410_ops = {
@@ -30,7 +32,7 @@
  };
  
  /*------------------------- gadget driver handling---------------------------*/
-Index: linux-2.6.21-moko/include/asm/arch-s3c2410/udc.h
+Index: linux-2.6.21-moko/include/asm-arm/arch-s3c2410/udc.h
 ===================================================================
 --- linux-2.6.21-moko.orig/include/asm-arm/arch-s3c2410/udc.h
 +++ linux-2.6.21-moko/include/asm-arm/arch-s3c2410/udc.h