Merge "qbt1000: Initialize drvdata structure before usage" (34c86338) · Commits · e / devices / android_kernel_sony_msm8998

drivers/soc/qcom/qbt1000.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -377,6 +377,12 @@ static long qbt1000_ioctl(struct file *file, unsigned cmd, unsigned long arg)

		drvdata = file->private_data;

		if (IS_ERR(priv_arg)) {
		dev_err(drvdata->dev, "%s: invalid user space pointer %lu\n",
		__func__, arg);
		return -EINVAL;
		}

		mutex_lock(&drvdata->mutex);

		pr_debug("qbt1000_ioctl %d\n", cmd);
		@@ -421,6 +427,7 @@ static long qbt1000_ioctl(struct file *file, unsigned cmd, unsigned long arg)
		}

		pr_debug("app %s load before\n", app.name);
		app.name[MAX_NAME_SIZE - 1] = '\0';

		/* start the TZ app */
		rc = qseecom_start_app(
		@@ -434,7 +441,8 @@ static long qbt1000_ioctl(struct file *file, unsigned cmd, unsigned long arg)
		pr_err("App %s failed to set bw\n", app.name);
		}
		} else {
		pr_err("app %s failed to load\n", app.name);
		dev_err(drvdata->dev, "%s: Fingerprint Trusted App failed to load\n",
		__func__);
		goto end;
		}