diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-26 17:36:28 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-26 17:36:28 +0300 |
| commit | bc46e23c34259c842a138f10acc371e4e2cdb287 (patch) | |
| tree | 4f6d6938f824abae24e0bb9c563cf07522a19c89 /drivers/usb/gadget/function/u_printer.h | |
| parent | 6969408de2681e1f9dfaed0b311d067ce3c75474 (diff) | |
| parent | e42a5dbb8a3d14f5a35bffa3bf7dcb87883f767a (diff) | |
| download | linux-bc46e23c34259c842a138f10acc371e4e2cdb287.tar.xz | |
Merge tag 'usb-for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next
Felipe writes:
USB: changes for v4.11
Here's the big pull request for the Gadget
API. Again the majority of changes sit in dwc2
driver. Most important changes contain a workaround
for GOTGCTL being wrong, a sleep-inside-spinlock fix
and the big series of cleanups on dwc2.
One important thing on dwc3 is that we don't anymore
need gadget drivers to cope with unaligned OUT
transfers for us. We have support for appending one
extra chained TRB to align transfer ourselves.
Apart from these, the usual set of typos,
non-critical fixes, etc.
Diffstat (limited to 'drivers/usb/gadget/function/u_printer.h')
| -rw-r--r-- | drivers/usb/gadget/function/u_printer.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/gadget/function/u_printer.h b/drivers/usb/gadget/function/u_printer.h index 0e2c49d4274e..8d30b7577f87 100644 --- a/drivers/usb/gadget/function/u_printer.h +++ b/drivers/usb/gadget/function/u_printer.h @@ -18,12 +18,11 @@ #include <linux/usb/composite.h> -#define PNP_STRING_LEN 1024 - struct f_printer_opts { struct usb_function_instance func_inst; int minor; - char pnp_string[PNP_STRING_LEN]; + char *pnp_string; + bool pnp_string_allocated; unsigned q_len; /* |