diff options
| author | Tom Rini <trini@konsulko.com> | 2018-05-03 09:20:13 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-03 09:20:13 -0400 |
| commit | db13e05ddae8f4ca01c56fc729e67058774df044 (patch) | |
| tree | 8d949c873c28ac9e11a5471373d7b366bff6e88c | |
| parent | 9f881a590fc6a22be26502cf893626feb31ad1fc (diff) | |
| parent | 48cdfa2f8177dbdfc77c365c0f3f918ceadbe484 (diff) | |
| download | u-boot-db13e05ddae8f4ca01c56fc729e67058774df044.zip u-boot-db13e05ddae8f4ca01c56fc729e67058774df044.tar.gz u-boot-db13e05ddae8f4ca01c56fc729e67058774df044.tar.bz2 | |
Merge git://git.denx.de/u-boot-usb
| -rw-r--r-- | drivers/usb/gadget/composite.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/f_mass_storage.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index a87639d..6e4426c 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -165,7 +165,7 @@ static int config_buf(struct usb_configuration *config, int len = USB_BUFSIZ - USB_DT_CONFIG_SIZE; void *next = buf + USB_DT_CONFIG_SIZE; struct usb_descriptor_header **descriptors; - struct usb_config_descriptor *c = buf; + struct usb_config_descriptor *c; int status; struct usb_function *f; diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index 1ecb92a..7d7ed42 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -1744,7 +1744,7 @@ static int check_command(struct fsg_common *common, int cmnd_size, common->lun, lun); /* Check the LUN */ - if (common->lun >= 0 && common->lun < common->nluns) { + if (common->lun < common->nluns) { curlun = &common->luns[common->lun]; if (common->cmnd[0] != SC_REQUEST_SENSE) { curlun->sense_data = SS_NO_SENSE; |