diff options
Diffstat (limited to 'drivers/usb/gadget/composite.c')
-rw-r--r-- | drivers/usb/gadget/composite.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index 957f973dd96a..2a6bfe759c29 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c | |||
@@ -107,7 +107,7 @@ int config_ep_by_speed(struct usb_gadget *g, | |||
107 | } | 107 | } |
108 | /* else: fall through */ | 108 | /* else: fall through */ |
109 | default: | 109 | default: |
110 | speed_desc = f->descriptors; | 110 | speed_desc = f->fs_descriptors; |
111 | } | 111 | } |
112 | /* find descriptors */ | 112 | /* find descriptors */ |
113 | for_each_ep_desc(speed_desc, d_spd) { | 113 | for_each_ep_desc(speed_desc, d_spd) { |
@@ -200,7 +200,7 @@ int usb_add_function(struct usb_configuration *config, | |||
200 | * as full speed ... it's the function drivers that will need | 200 | * as full speed ... it's the function drivers that will need |
201 | * to avoid bulk and ISO transfers. | 201 | * to avoid bulk and ISO transfers. |
202 | */ | 202 | */ |
203 | if (!config->fullspeed && function->descriptors) | 203 | if (!config->fullspeed && function->fs_descriptors) |
204 | config->fullspeed = true; | 204 | config->fullspeed = true; |
205 | if (!config->highspeed && function->hs_descriptors) | 205 | if (!config->highspeed && function->hs_descriptors) |
206 | config->highspeed = true; | 206 | config->highspeed = true; |
@@ -363,7 +363,7 @@ static int config_buf(struct usb_configuration *config, | |||
363 | descriptors = f->hs_descriptors; | 363 | descriptors = f->hs_descriptors; |
364 | break; | 364 | break; |
365 | default: | 365 | default: |
366 | descriptors = f->descriptors; | 366 | descriptors = f->fs_descriptors; |
367 | } | 367 | } |
368 | 368 | ||
369 | if (!descriptors) | 369 | if (!descriptors) |
@@ -620,7 +620,7 @@ static int set_config(struct usb_composite_dev *cdev, | |||
620 | descriptors = f->hs_descriptors; | 620 | descriptors = f->hs_descriptors; |
621 | break; | 621 | break; |
622 | default: | 622 | default: |
623 | descriptors = f->descriptors; | 623 | descriptors = f->fs_descriptors; |
624 | } | 624 | } |
625 | 625 | ||
626 | for (; *descriptors; ++descriptors) { | 626 | for (; *descriptors; ++descriptors) { |