hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/usb/gadget/udc/tegra-xudc.c
....@@ -2154,7 +2154,7 @@
21542154
21552155 dev_dbg(xudc->dev, "%s: %u mA\n", __func__, m_a);
21562156
2157
- if (xudc->curr_usbphy->chg_type == SDP_TYPE)
2157
+ if (xudc->curr_usbphy && xudc->curr_usbphy->chg_type == SDP_TYPE)
21582158 ret = usb_phy_set_power(xudc->curr_usbphy, m_a);
21592159
21602160 return ret;
....@@ -3693,15 +3693,15 @@
36933693 int err;
36943694
36953695 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);
36983698 dev_err(dev, "failed to get device power domain: %d\n", err);
36993699 return err;
37003700 }
37013701
37023702 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);
37053705 dev_err(dev, "failed to get SuperSpeed power domain: %d\n", err);
37063706 return err;
37073707 }