Merge "coresight-byte-cntr: Fix the Byte-Counter read operation" (89c2aecb) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/hwtracing/coresight/coresight-byte-cntr.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -163,7 +163,7 @@ static ssize_t tmc_etr_byte_cntr_read(struct file fp, char __user data,
	goto err0;		goto err0;
	}		}

	if (tmcdrvdata->mem_type == TMC_ETR_MEM_TYPE_CONTIG)		if (tmcdrvdata->memtype == TMC_ETR_MEM_TYPE_CONTIG)
	tmc_etr_read_bytes(byte_cntr_data, ppos,		tmc_etr_read_bytes(byte_cntr_data, ppos,
	byte_cntr_data->block_size, &len,		byte_cntr_data->block_size, &len,
	&bufp);		&bufp);
	@@ -173,7 +173,7 @@ static ssize_t tmc_etr_byte_cntr_read(struct file fp, char __user data,

	} else {		} else {
	if (!atomic_read(&byte_cntr_data->irq_cnt)) {		if (!atomic_read(&byte_cntr_data->irq_cnt)) {
	if (tmcdrvdata->mem_type == TMC_ETR_MEM_TYPE_CONTIG)		if (tmcdrvdata->memtype == TMC_ETR_MEM_TYPE_CONTIG)
	tmc_etr_flush_bytes(ppos,		tmc_etr_flush_bytes(ppos,
	byte_cntr_data->block_size,		byte_cntr_data->block_size,
	&len);		&len);
	@@ -185,7 +185,7 @@ static ssize_t tmc_etr_byte_cntr_read(struct file fp, char __user data,
	if (!len)		if (!len)
	goto err0;		goto err0;
	} else {		} else {
	if (tmcdrvdata->mem_type == TMC_ETR_MEM_TYPE_CONTIG)		if (tmcdrvdata->memtype == TMC_ETR_MEM_TYPE_CONTIG)
	tmc_etr_read_bytes(byte_cntr_data, ppos,		tmc_etr_read_bytes(byte_cntr_data, ppos,
	byte_cntr_data->block_size,		byte_cntr_data->block_size,
	&len, &bufp);		&len, &bufp);