diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2019-09-12 17:49:56 +0200 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-09-13 21:59:51 +0200 |
| commit | 75c66515e4fea4e9bb488b6125e014220f846c61 (patch) | |
| tree | a7a79ca9a05da74fd3fd74b1c8c3e1cb2901c167 /drivers/usb/gadget | |
| parent | IB/iser: Support up to 16MB data transfer in a single command (diff) | |
| parent | Linux 5.3-rc8 (diff) | |
| download | linux-75c66515e4fea4e9bb488b6125e014220f846c61.tar.xz linux-75c66515e4fea4e9bb488b6125e014220f846c61.zip | |
Merge tag 'v5.3-rc8' into rdma.git for-next
To resolve dependencies in following patches
mlx5_ib.h conflict resolved by keeing both hunks
Linux 5.3-rc8
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/udc/lpc32xx_udc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/udc/lpc32xx_udc.c b/drivers/usb/gadget/udc/lpc32xx_udc.c index 5f1b14f3e5a0..bb6af6b5ac97 100644 --- a/drivers/usb/gadget/udc/lpc32xx_udc.c +++ b/drivers/usb/gadget/udc/lpc32xx_udc.c @@ -2265,7 +2265,7 @@ static void udc_handle_ep0_setup(struct lpc32xx_udc *udc) default: break; } - + break; case USB_REQ_SET_ADDRESS: if (reqtype == (USB_TYPE_STANDARD | USB_RECIP_DEVICE)) { |