Merge "HID: qvr: using different dma-buf APIs" (531631f9) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/hid/hid-qvr.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -383,10 +383,10 @@ static int kernel_map_gyro_buffer(void)
	goto err_dma;		goto err_dma;
	}		}
	sensor->vsize = sensor->qvr_buf->size;		sensor->vsize = sensor->qvr_buf->size;
	sensor->vaddr = dma_buf_kmap(sensor->qvr_buf, 0);		sensor->vaddr = dma_buf_vmap(sensor->qvr_buf);
	if (IS_ERR_OR_NULL(sensor->vaddr)) {		if (!sensor->vaddr) {
	ret = -ENOMEM;		ret = -ENOMEM;
	pr_err("dma_buf_kmap failed for fd: %d\n", sensor->fd);		pr_err("dma_buf_vmap failed for fd: %d\n", sensor->fd);
	goto err_end_access;		goto err_end_access;
	}		}

	@@ -409,7 +409,7 @@ static void kernel_unmap_gyro_buffer(void)

	if (IS_ERR_OR_NULL(sensor->vaddr))		if (IS_ERR_OR_NULL(sensor->vaddr))
	return;		return;
	dma_buf_kunmap(sensor->qvr_buf, 0, sensor->vaddr);		dma_buf_vunmap(sensor->qvr_buf, sensor->vaddr);
	dma_buf_end_cpu_access(sensor->qvr_buf, DMA_BIDIRECTIONAL);		dma_buf_end_cpu_access(sensor->qvr_buf, DMA_BIDIRECTIONAL);
	sensor->vaddr = NULL;		sensor->vaddr = NULL;
	dma_buf_put(sensor->qvr_buf);		dma_buf_put(sensor->qvr_buf);