[ARM] tegra: stingray: Do not enumerate as usbnet
authorJames Wilson <james.wilson@motorola.com>
Wed, 27 Oct 2010 20:33:47 +0000 (15:33 -0500)
committerRebecca Schultz Zavin <rebecca@android.com>
Mon, 1 Nov 2010 21:35:22 +0000 (14:35 -0700)
during recovery mode, even if using factory cable.

Signed-off-by: James Wilson <james.wilson@motorola.com>
arch/arm/mach-tegra/board-stingray.c

index 962224ce6f672fac81a4934b7c1bcf6905c8c349..58e3456c1f0331b0c1e3d3b9516714041ad6b33c 100644 (file)
@@ -752,6 +752,14 @@ static int __init mot_usb_serial_num_setup(char *options)
 }
 __setup("androidboot.serialno=", mot_usb_serial_num_setup);
 
+static int mot_boot_recovery = 0;
+static int __init mot_bm_recovery_setup()
+{
+       mot_boot_recovery = 1;
+       return 1;
+}
+__setup("rec", mot_bm_recovery_setup);
+
 static void stingray_usb_init(void)
 {
        char *src;
@@ -780,7 +788,8 @@ static void stingray_usb_init(void)
        platform_device_register(&rndis_device);
 #endif
 
-       if (!strncmp(boot_mode, "factorycable", BOOT_MODE_MAX_LEN))
+       if (!strncmp(boot_mode, "factorycable", BOOT_MODE_MAX_LEN) &&
+            !mot_boot_recovery)
        {
                platform_data = &andusb_plat_factory;
                platform_device_register(&usbnet_device);