evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "usb: pd: pdphy: Assign __pdphy before usbpd_create()"

Browse source
This commit is contained in:
Linux Build Service Account 2016-07-15 14:34:45 -07:00 • committed by Gerrit - the friendly Code Review server
commit 5b706a9e62
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/usb/pd/qpnp-pdphy.c
View file

@ -318,7 +318,7 @@ int pd_phy_open(struct pd_phy_params *params)
struct usb_pdphy *pdphy = __pdphy; struct usb_pdphy *pdphy = __pdphy;
if (!pdphy) { if (!pdphy) {
dev_err(pdphy->dev, "%s: pdphy not found\n", __func__); pr_err("%s: pdphy not found\n", __func__);
return -ENODEV; return -ENODEV;
} }
@ -382,7 +382,7 @@ int pd_phy_signal(enum pd_sig_type type, unsigned int timeout_ms)
timeout_ms); timeout_ms);
if (!pdphy) { if (!pdphy) {
dev_err(pdphy->dev, "%s: pdphy not found\n", __func__); pr_err("%s: pdphy not found\n", __func__);
return -ENODEV; return -ENODEV;
} }
@ -440,7 +440,7 @@ int pd_phy_write(u16 hdr, const u8 *data, size_t data_len,
data, data_len, false); data, data_len, false);
if (!pdphy) { if (!pdphy) {
dev_err(pdphy->dev, "%s: pdphy not found\n", __func__); pr_err("%s: pdphy not found\n", __func__);
return -ENODEV; return -ENODEV;
} }
@ -507,7 +507,7 @@ void pd_phy_close(void)
struct usb_pdphy *pdphy = __pdphy; struct usb_pdphy *pdphy = __pdphy;
if (!pdphy) { if (!pdphy) {
dev_err(pdphy->dev, "%s: pdphy not found\n", __func__); pr_err("%s: pdphy not found\n", __func__);
return; return;
} }
@ -766,15 +766,17 @@ static int pdphy_probe(struct platform_device *pdev)
if (ret < 0) if (ret < 0)
return ret; return ret;
/* usbpd_create() could call back to us, so have __pdphy ready */
__pdphy = pdphy;
pdphy->usbpd = usbpd_create(&pdev->dev); pdphy->usbpd = usbpd_create(&pdev->dev);
if (IS_ERR(pdphy->usbpd)) { if (IS_ERR(pdphy->usbpd)) {
dev_err(&pdev->dev, "usbpd_create failed: %ld\n", dev_err(&pdev->dev, "usbpd_create failed: %ld\n",
PTR_ERR(pdphy->usbpd)); PTR_ERR(pdphy->usbpd));
__pdphy = NULL;
return PTR_ERR(pdphy->usbpd); return PTR_ERR(pdphy->usbpd);
} }
__pdphy = pdphy;
pdphy_create_debugfs_entries(pdphy); pdphy_create_debugfs_entries(pdphy);
return 0; return 0;