* Andrzej Pietrasiewicz | 2012-09-17 09:10:00 [+0200]:
>--- a/drivers/usb/gadget/f_mass_storage.c
>+++ b/drivers/usb/gadget/f_mass_storage.c
>@@ -2694,65 +2848,69 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common,
> fsg_intf_desc.iInterface = rc;
> }
>
>+ /* Prepare inquiryString */
>+ /*if (cfg->release != 0xffff) {
>+ i = cfg->release;
>+ } else */{
What is this?
>+ i = get_default_bcdDevice();
>+ if (i >= 0) {
>+ i = 0x0300 + i;
>+ } else {
>+ WARNING(common, "controller '%s' not recognized\n",
>+ gadget->name);
>+ i = 0x0399;
>+ }
>+ }
Please merge properly It does not look that way, that 0x0399 got removed
while I added get_default_bcdDevice().
>@@ -2994,26 +3121,41 @@ static struct usb_gadget_strings *fsg_strings_array[] = {
<snip>
>- fsg->function.name = FSG_DRIVER_DESC;
>- fsg->function.strings = fsg_strings_array;
>- fsg->function.bind = fsg_bind;
>- fsg->function.unbind = fsg_unbind;
>- fsg->function.setup = fsg_setup;
>- fsg->function.set_alt = fsg_set_alt;
>- fsg->function.disable = fsg_disable;
>+ fsg->function.name = FSG_DRIVER_DESC;
>+ fsg->function.strings = fsg_strings_array;
>+ fsg->function.bind = fsg_bind;
>+ fsg->function.unbind = fsg_unbind;
>+ fsg->function.setup = fsg_setup;
>+ fsg->function.set_alt = fsg_set_alt;
>+ fsg->function.disable = fsg_disable;
This is just cosmetic right?
>--- a/drivers/usb/gadget/storage_common.c
>+++ b/drivers/usb/gadget/storage_common.c
>@@ -321,7 +507,7 @@ enum {
> #ifndef FSG_NO_OTG
> static struct usb_otg_descriptor
> fsg_otg_desc = {
>- .bLength = sizeof fsg_otg_desc,
>+ .bLength = sizeof(fsg_otg_desc),
> .bDescriptorType = USB_DT_OTG,
>
> .bmAttributes = USB_OTG_SRP,
and this coding style fixup which does not belong in here as well.
Please remove that nonsense from your patch before posting.
This patch ends with
|+#include "f_mass_storage.c"
This is no good. I'm going to remove that include statement from current
gadgets in tree. But don't complain because I'm going to make the life
easier for you and this patch even smaller :) What you will get from me
is a function which gives you pointer to something that describes a function
and maybe something that configures it (including luns and ...). Not
sure yet.
Sebastian
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
