A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 21:22:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "usb: dwc3-msm: Fix usage of find_matching_dbm_ep()"

Browse source
This commit is contained in:
qctecmdr 2019-11-21 09:45:13 -08:00 • committed by Gerrit - the friendly Code Review server
commit 57aa166221
2 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/usb/dwc3/core.c
View file

@ -1557,7 +1557,7 @@ static int dwc3_probe(struct platform_device *pdev)
if (dev->of_node) {
dwc->num_clks = ARRAY_SIZE(dwc3_core_clks);
ret = devm_clk_bulk_get(dev, dwc->num_clks, dwc->clks);
ret = devm_clk_bulk_get_optional(dev, dwc->num_clks, dwc->clks);
if (ret == -EPROBE_DEFER)
goto err0;
/*

34
drivers/usb/dwc3/dwc3-msm.c
View file

@ -706,11 +706,8 @@ static int dwc3_msm_dbm_disable_updxfer(struct dwc3 *dwc, u8 usb_ep)
dev_dbg(mdwc->dev, "%s\n", __func__);
dbm_ep = find_matching_dbm_ep(mdwc, usb_ep);
if (dbm_ep < 0) {
pr_err("usb ep index %d has no corresponding dbm ep\n", usb_ep);
return -ENODEV;
}
if (dbm_ep < 0)
return dbm_ep;
data = msm_dbm_read_reg(mdwc, DBM_DISABLE_UPDXFER);
data |= (0x1 << dbm_ep);
@ -871,11 +868,8 @@ int msm_dwc3_reset_dbm_ep(struct usb_ep *ep)
int dbm_ep;
dbm_ep = find_matching_dbm_ep(mdwc, dep->number);
if (dbm_ep >= mdwc->dbm_num_eps) {
pr_err("Invalid DBM ep index %d\n", dbm_ep);
return -ENODEV;
}
if (dbm_ep < 0)
return dbm_ep;
dev_dbg(mdwc->dev, "Resetting endpoint %d, DBM ep %d\n", dep->number,
dbm_ep);
@ -1820,11 +1814,8 @@ static int dbm_ep_config(struct dwc3_msm *mdwc, u8 usb_ep, u8 bam_pipe,
dev_dbg(mdwc->dev, "Configuring DBM ep\n");
dbm_ep = find_matching_dbm_ep(mdwc, usb_ep);
if (dbm_ep < 0) {
pr_err("usb ep index %d has no corresponding dbm ep\n", usb_ep);
return -ENODEV;
}
if (dbm_ep < 0)
return dbm_ep;
/* Due to HW issue, EP 7 can be set as IN EP only */
if (!mdwc->dbm_is_1p4 && dbm_ep == 7 && producer) {
@ -1987,12 +1978,8 @@ static int dbm_ep_unconfig(struct dwc3_msm *mdwc, u8 usb_ep)
dev_dbg(mdwc->dev, "Unconfiguring DB ep\n");
dbm_ep = find_matching_dbm_ep(mdwc, usb_ep);
if (dbm_ep < 0) {
dev_info(mdwc->dev, "usb ep index %d has no corespondng dbm ep\n",
usb_ep);
return -ENODEV;
}
if (dbm_ep < 0)
return dbm_ep;
mdwc->dbm_ep_num_mapping[dbm_ep] = 0;
@ -4115,9 +4102,6 @@ static int dwc3_msm_remove(struct platform_device *pdev)
mdwc->dpdm_nb.notifier_call = NULL;
}
if (mdwc->usb_psy)
power_supply_put(mdwc->usb_psy);
/*
* In case of system suspend, pm_runtime_get_sync fails.
* Hence turn ON the clocks manually.
@ -4527,7 +4511,7 @@ static int dwc3_msm_gadget_vbus_draw(struct dwc3_msm *mdwc, unsigned int mA)
int ret;
if (!mdwc->usb_psy) {
mdwc->usb_psy = power_supply_get_by_phandle(mdwc->dev->of_node,
mdwc->usb_psy = devm_power_supply_get_by_phandle(mdwc->dev,
"qcom,usb-charger");
if (IS_ERR_OR_NULL(mdwc->usb_psy)) {
dev_info(mdwc->dev, "Could not get usb psy\n");