Merge "input: touchscreen: hxchipset: fix crash when i2c fails" (8a6c1e2c) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/input/touchscreen/hxchipset/himax_common.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1959,6 +1959,7 @@ int himax_chip_common_init(void)

		if (himax_parse_dt(ts, pdata) < 0) {
		I(" pdata is NULL for DT\n");
		err = -ECANCELED;
		goto err_alloc_dt_pdata_failed;
		}

		@@ -1973,6 +1974,7 @@ int himax_chip_common_init(void)

		if (ret < 0) {
		E("%s: power on failed\n", __func__);
		err = ret;
		goto err_power_failed;
		}
		}
		@@ -1984,10 +1986,12 @@ int himax_chip_common_init(void)
		g_core_fp.fp_chip_init();
		} else {
		E("%s: chip detect failed!\n", __func__);
		err = -ECANCELED;
		goto error_ic_detect_failed;
		}
		} else {
		E("%s: function point is NULL!\n", __func__);
		err = -ECANCELED;
		goto error_ic_detect_failed;
		}

		@@ -2028,6 +2032,7 @@ int himax_chip_common_init(void)
		/* Himax Power On and Load Config */
		if (himax_loadSensorConfig(pdata)) {
		E("%s: Load Sesnsor configuration failed, unload driver.\n", __func__);
		err = -ECANCELED;
		goto err_detect_failed;
		}

		@@ -2069,6 +2074,7 @@ int himax_chip_common_init(void)
		if (ret) {
		E("%s: Unable to register %s input device\n",
		__func__, ts->input_dev->name);
		err = ret;
		goto err_input_register_device_failed;
		}

		@@ -2098,6 +2104,7 @@ int himax_chip_common_init(void)

		if (himax_common_proc_init()) {
		E(" %s: himax_common proc_init failed!\n", __func__);
		err = -ECANCELED;
		goto err_creat_proc_file_failed;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -660,7 +660,7 @@ int fb_notifier_callback(struct notifier_block *self, unsigned long event, void
		case MSM_DRM_BLANK_UNBLANK:
		if (!ts->initialized) {
		if (himax_chip_common_init())
		return 0;
		return -ECANCELED;
		ts->initialized = true;
		}
		himax_common_resume(&ts->client->dev);