Unverified Commit b6020e3c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5904 [sync] PR-4931: phy: ti: phy-omap-usb2: Fix NULL pointer dereference for SRP 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/4931 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/JXNI5VT3RT75BCKAL4RBHJD4OQPZS3Z3/ 
 
https://gitee.com/src-openeuler/kernel/issues/I93HCX 
 
Link:https://gitee.com/openeuler/kernel/pulls/5904

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 26fc058a 7fd5f963

drivers/phy/ti/phy-omap-usb2.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int omap_usb_set_vbus(struct usb_otg *otg, bool enabled) 
{

	struct omap_usb *phy = phy_to_omapusb(otg->usb_phy);



	if (!phy->comparator)

	if (!phy->comparator || !phy->comparator->set_vbus)

		return -ENODEV;



	return phy->comparator->set_vbus(phy->comparator, enabled);
@@ -126,7 +126,7 @@ static int omap_usb_start_srp(struct usb_otg *otg) 
{

	struct omap_usb *phy = phy_to_omapusb(otg->usb_phy);



	if (!phy->comparator)

	if (!phy->comparator || !phy->comparator->start_srp)

		return -ENODEV;



	return phy->comparator->start_srp(phy->comparator);