Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / usb / gadget / file_storage.c

diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 7dcdbda..b49d86e 100644 (file)
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -3208,15 +3208,11 @@ static int __init check_parameters(struct fsg_dev *fsg)
         * halt bulk endpoints correctly.  If one of them is present,
         * disable stalls.
         */
-       if (gadget_is_sh(fsg->gadget) || gadget_is_at91(fsg->gadget))
+       if (gadget_is_at91(fsg->gadget))
                mod_data.can_stall = 0;
 
        if (mod_data.release == 0xffff) {       // Parameter wasn't set
-               /* The sa1100 controller is not supported */
-               if (gadget_is_sa1100(fsg->gadget))
-                       gcnum = -1;
-               else
-                       gcnum = usb_gadget_controller_number(fsg->gadget);
+               gcnum = usb_gadget_controller_number(fsg->gadget);
                if (gcnum >= 0)
                        mod_data.release = 0x0300 + gcnum;
                else {