Merge git://git.denx.de/u-boot-usb

lime2-spi
Tom Rini 6 years ago
commit db13e05dda
  1. 2
      drivers/usb/gadget/composite.c
  2. 2
      drivers/usb/gadget/f_mass_storage.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;

@ -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;

Loading…
Cancel
Save