diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-03-30 23:43:03 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-03-30 23:43:03 +0200 |
| commit | 79548b7984e4c606c6caaad72a0864a83855ebc9 (patch) | |
| tree | 05e1be823acbae8bbcd155a706eb9e4f84eee047 /drivers/usb/chipidea/otg.c | |
| parent | smsc911x: remove superfluous variable init (diff) | |
| parent | Merge tag 'net-6.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-79548b7984e4c606c6caaad72a0864a83855ebc9.tar.xz linux-79548b7984e4c606c6caaad72a0864a83855ebc9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/mediatek/mtk_ppe.c
3fbe4d8c0e53 ("net: ethernet: mtk_eth_soc: ppe: add support for flow accounting")
924531326e2d ("net: ethernet: mtk_eth_soc: add missing ppe cache flush when deleting a flow")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/usb/chipidea/otg.c')
| -rw-r--r-- | drivers/usb/chipidea/otg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c index 622c3b68aa1e..f5490f2a5b6b 100644 --- a/drivers/usb/chipidea/otg.c +++ b/drivers/usb/chipidea/otg.c @@ -167,8 +167,10 @@ static int hw_wait_vbus_lower_bsv(struct ci_hdrc *ci) void ci_handle_id_switch(struct ci_hdrc *ci) { - enum ci_role role = ci_otg_role(ci); + enum ci_role role; + mutex_lock(&ci->mutex); + role = ci_otg_role(ci); if (role != ci->role) { dev_dbg(ci->dev, "switching from %s to %s\n", ci_role(ci)->name, ci->roles[role]->name); @@ -198,6 +200,7 @@ void ci_handle_id_switch(struct ci_hdrc *ci) if (role == CI_ROLE_GADGET) ci_handle_vbus_change(ci); } + mutex_unlock(&ci->mutex); } /** * ci_otg_work - perform otg (vbus/id) event handle |