Merge "drm/msm/dp: fix error checks in hotplug module" (bec1e0cb) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/gpu/drm/msm/dp/dp_hpd.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -46,23 +46,23 @@ struct dp_hpd dp_hpd_get(struct device dev, struct dp_parser *parser,

		if (parser->no_aux_switch && parser->lphw_hpd) {
		dp_hpd = dp_lphw_hpd_get(dev, parser, catalog, cb);
		if (!dp_hpd) {
		if (IS_ERR(dp_hpd)) {
		pr_err("failed to get lphw hpd\n");
		return dp_hpd;
		}
		dp_hpd->type = DP_HPD_LPHW;
		} else if (parser->no_aux_switch) {
		dp_hpd = dp_gpio_hpd_get(dev, cb);
		if (!dp_hpd) {
		if (IS_ERR(dp_hpd)) {
		pr_err("failed to get gpio hpd\n");
		goto out;
		return dp_hpd;
		}
		dp_hpd->type = DP_HPD_GPIO;
		} else {
		dp_hpd = dp_usbpd_get(dev, cb);
		if (!dp_hpd) {
		if (IS_ERR(dp_hpd)) {
		pr_err("failed to get usbpd\n");
		goto out;
		return dp_hpd;
		}
		dp_hpd->type = DP_HPD_USBPD;
		}
		@@ -74,7 +74,6 @@ struct dp_hpd dp_hpd_get(struct device dev, struct dp_parser *parser,
		if (!dp_hpd->isr)
		dp_hpd->isr = dp_hpd_isr;

		out:
		return dp_hpd;
		}