hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/usb/host/xhci-tegra.c
....@@ -1042,15 +1042,15 @@
10421042 int err;
10431043
10441044 tegra->genpd_dev_host = dev_pm_domain_attach_by_name(dev, "xusb_host");
1045
- if (IS_ERR_OR_NULL(tegra->genpd_dev_host)) {
1046
- err = PTR_ERR(tegra->genpd_dev_host) ? : -ENODATA;
1045
+ if (IS_ERR(tegra->genpd_dev_host)) {
1046
+ err = PTR_ERR(tegra->genpd_dev_host);
10471047 dev_err(dev, "failed to get host pm-domain: %d\n", err);
10481048 return err;
10491049 }
10501050
10511051 tegra->genpd_dev_ss = dev_pm_domain_attach_by_name(dev, "xusb_ss");
1052
- if (IS_ERR_OR_NULL(tegra->genpd_dev_ss)) {
1053
- err = PTR_ERR(tegra->genpd_dev_ss) ? : -ENODATA;
1052
+ if (IS_ERR(tegra->genpd_dev_ss)) {
1053
+ err = PTR_ERR(tegra->genpd_dev_ss);
10541054 dev_err(dev, "failed to get superspeed pm-domain: %d\n", err);
10551055 return err;
10561056 }
....@@ -1175,6 +1175,9 @@
11751175
11761176 mutex_unlock(&tegra->lock);
11771177
1178
+ tegra->otg_usb3_port = tegra_xusb_padctl_get_usb3_companion(tegra->padctl,
1179
+ tegra->otg_usb2_port);
1180
+
11781181 if (tegra->host_mode) {
11791182 /* switch to host mode */
11801183 if (tegra->otg_usb3_port >= 0) {
....@@ -1243,9 +1246,6 @@
12431246 }
12441247
12451248 tegra->otg_usb2_port = tegra_xusb_get_usb2_port(tegra, usbphy);
1246
- tegra->otg_usb3_port = tegra_xusb_padctl_get_usb3_companion(
1247
- tegra->padctl,
1248
- tegra->otg_usb2_port);
12491249
12501250 tegra->host_mode = (usbphy->last_event == USB_EVENT_ID) ? true : false;
12511251