diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2014-03-18 11:25:11 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2014-03-18 11:25:11 +0100 |
| commit | 72249651843f93d50c302833546fb2880052a80f (patch) | |
| tree | 172a8af74ce161bc276856d7331dc0076055093c /drivers/usb/gadget/file_storage.c | |
| parent | aef4075a0bcc7860eafa17be0c6e6cfcecc68206 (diff) | |
| parent | 50c4c848d6b8743894cfcec166db475ef6140504 (diff) | |
Merge tag '3.0-vybrid-ts2.13' into colibri_vfColibri_VF_LinuxImageV2.1Beta3_20140318
3.0-vybrid-ts2.13
Diffstat (limited to 'drivers/usb/gadget/file_storage.c')
| -rw-r--r-- | drivers/usb/gadget/file_storage.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c index 390d43b0e2a1..b226412b926d 100644 --- a/drivers/usb/gadget/file_storage.c +++ b/drivers/usb/gadget/file_storage.c @@ -280,7 +280,7 @@ static const char fsg_string_product[] = DRIVER_DESC; static const char fsg_string_config[] = "Self-powered"; static const char fsg_string_interface[] = "Mass Storage"; - +#define FSG_NO_OTG 1 1 #include "storage_common.c" @@ -3491,8 +3491,8 @@ static int __ref fsg_bind(struct usb_gadget *gadget) fsg_fs_intr_in_desc.bEndpointAddress; } - if (gadget_is_otg(gadget)) - fsg_otg_desc.bmAttributes |= USB_OTG_HNP; +// if (gadget_is_otg(gadget)) +// fsg_otg_desc.bmAttributes |= USB_OTG_HNP; rc = -ENOMEM; |