Merge "coresight: take lock before modifying byte cntr value" (aeb8972b) · Commits · e / devices / android_kernel_sony_msm8994

drivers/coresight/coresight-tmc.c

+14 −4

Original line number	Diff line number	Diff line
		@@ -1295,16 +1295,26 @@ static ssize_t tmc_etr_store_byte_cntr_value(struct device *dev,
		struct tmc_drvdata *drvdata = dev_get_drvdata(dev->parent);
		unsigned long val;

		if (!drvdata->byte_cntr_present \|\| drvdata->byte_cntr_enable)
		mutex_lock(&drvdata->byte_cntr_lock);
		if (!drvdata->byte_cntr_present \|\| drvdata->byte_cntr_enable) {
		mutex_unlock(&drvdata->byte_cntr_lock);
		return -EPERM;
		if (sscanf(buf, "%lx", &val) != 1)
		}
		if (sscanf(buf, "%lx", &val) != 1) {
		mutex_unlock(&drvdata->byte_cntr_lock);
		return -EINVAL;
		if ((drvdata->size / 8) < val)
		}
		if ((drvdata->size / 8) < val) {
		mutex_unlock(&drvdata->byte_cntr_lock);
		return -EINVAL;
		if (val && drvdata->size % (val * 8) != 0)
		}
		if (val && drvdata->size % (val * 8) != 0) {
		mutex_unlock(&drvdata->byte_cntr_lock);
		return -EINVAL;
		}

		drvdata->byte_cntr_value = val;
		mutex_unlock(&drvdata->byte_cntr_lock);
		return size;
		}
		static DEVICE_ATTR(byte_cntr_value, S_IRUGO \| S_IWUSR,