Merge tag 'usb-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi...

[karo-tx-linux.git] / drivers / usb / gadget / function / u_fs.h

diff --git a/drivers/usb/gadget/function/u_fs.h b/drivers/usb/gadget/function/u_fs.h
index abfca48544336735b3ffff02d2f86fc3577b749c..4378cc2fcac36fd69c71cdea53fef6e7ce6ce6e9 100644 (file)
--- a/drivers/usb/gadget/function/u_fs.h
+++ b/drivers/usb/gadget/function/u_fs.h
@@ -40,15 +40,16 @@
 struct f_fs_opts;
 
 struct ffs_dev {
-       const char *name;
-       bool name_allocated;
-       bool mounted;
-       bool desc_ready;
-       bool single;
        struct ffs_data *ffs_data;
        struct f_fs_opts *opts;
        struct list_head entry;
 
+       char name[41];
+
+       bool mounted;
+       bool desc_ready;
+       bool single;
+
        int (*ffs_ready_callback)(struct ffs_data *ffs);
        void (*ffs_closed_callback)(struct ffs_data *ffs);
        void *(*ffs_acquire_dev_callback)(struct ffs_dev *dev);