~hc/RK356X_SDK_RELEASE.git

..	..	@@ -2154,7 +2154,7 @@
2154	2154
2155	2155	dev_dbg(xudc->dev, "%s: %u mA\n", __func__, m_a);
2156	2156
2157		- if (xudc->curr_usbphy->chg_type == SDP_TYPE)
	2157	+ if (xudc->curr_usbphy && xudc->curr_usbphy->chg_type == SDP_TYPE)
2158	2158	ret = usb_phy_set_power(xudc->curr_usbphy, m_a);
2159	2159
2160	2160	return ret;
..	..	@@ -3693,15 +3693,15 @@
3693	3693	int err;
3694	3694
3695	3695	xudc->genpd_dev_device = dev_pm_domain_attach_by_name(dev, "dev");
3696		- if (IS_ERR_OR_NULL(xudc->genpd_dev_device)) {
3697		- err = PTR_ERR(xudc->genpd_dev_device) ? : -ENODATA;
	3696	+ if (IS_ERR(xudc->genpd_dev_device)) {
	3697	+ err = PTR_ERR(xudc->genpd_dev_device);
3698	3698	dev_err(dev, "failed to get device power domain: %d\n", err);
3699	3699	return err;
3700	3700	}
3701	3701
3702	3702	xudc->genpd_dev_ss = dev_pm_domain_attach_by_name(dev, "ss");
3703		- if (IS_ERR_OR_NULL(xudc->genpd_dev_ss)) {
3704		- err = PTR_ERR(xudc->genpd_dev_ss) ? : -ENODATA;
	3703	+ if (IS_ERR(xudc->genpd_dev_ss)) {
	3704	+ err = PTR_ERR(xudc->genpd_dev_ss);
3705	3705	dev_err(dev, "failed to get SuperSpeed power domain: %d\n", err);
3706	3706	return err;
3707	3707	}