usb: gadget: Fix controller index in UMS
PATCH 1/1 usb: gadget: Fix controller index in UMS
From: Ye Li <[email protected]>
The usb mass storage (f_mass_storage.c) uses fixed usb index 0, this causes problem while CDNS3 USB controller index is 1. Modify the API of fsg to pass the controller index.
Reviewed-by Jun Li <[email protected]>
Signed-off-by Ye Li <[email protected]>
Signed-off-by Peng Fan <[email protected]>
--- cmd/usb_mass_storage.c | 2 +- drivers/usb/gadget/f_mass_storage.c | 6 ++++-- include/usb_mass_storage.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-)
cmd/usb_mass_storage.c +1 -1
@@ -170,7 +170,7 @@ static int do_usb_mass_storage(struct cmd_tbl *cmdtp, int flag, goto cleanup_ums_init; } - rc =fsg_init (ums, ums_count); + rc =fsg_init (ums, ums_count, controller_index);if (rc) {pr_err ("fsg_init failed\n" ); rc =CMD_RET_FAILURE ;
drivers/usb/gadget/f_mass_storage.c +4 -2
@@ -435,6 +435,7 @@ static void set_bulk_out_req_length(struct fsg_common *common,static struct ums *ums;static int ums_count;static struct fsg_common *the_fsg_common; +static unsigned int controller_index;static int fsg_set_halt (struct fsg_dev *fsg,struct usb_ep *ep) {
@@ -679,7 +680,7 @@ static int sleep_thread(struct fsg_common *common) k =0 ; } -usb_gadget_handle_interrupts (0 ); +usb_gadget_handle_interrupts (controller_index); } common->thread_wakeup_needed =0 ;return rc;
@@ -2764,10 +2765,11 @@ int fsg_add(struct usb_configuration *c)return fsg_bind_config (c->cdev, c, fsg_common); } -int fsg_init (struct ums *ums_devs,int count) +int fsg_init (struct ums *ums_devs,int count,unsigned int controller_idx) { ums = ums_devs; ums_count = count; + controller_index = controller_idx;return 0 ; }
include/usb_mass_storage.h +1 -1
@@ -25,7 +25,7 @@ struct ums {struct blk_desc block_dev; }; -int fsg_init (struct ums *ums_devs,int count); +int fsg_init (struct ums *ums_devs,int count,unsigned int controller_idx);void fsg_cleanup (void );int fsg_main_thread (void *);int fsg_add (struct usb_configuration *c);
Signature · 1 line
2.16.4