diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 15:42:46 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 15:42:46 -0400 |
| commit | 9c80b4466d6850d19e441a7cad079f7457ace2e4 (patch) | |
| tree | 0feb9e50110c69b88a06cc366e75b50fe3446cfb | |
| parent | 917c16b4d1c3081902c460841de1acdaa2e87c1d (diff) | |
| download | longterm-queue-4.12-9c80b4466d6850d19e441a7cad079f7457ace2e4.tar.gz | |
staging: adjust for w/s
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/staging-android-ion-Fix-dma-direction-for-dma_sync_s.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/queue/staging-android-ion-Fix-dma-direction-for-dma_sync_s.patch b/queue/staging-android-ion-Fix-dma-direction-for-dma_sync_s.patch index 5bf7703..00fd257 100644 --- a/queue/staging-android-ion-Fix-dma-direction-for-dma_sync_s.patch +++ b/queue/staging-android-ion-Fix-dma-direction-for-dma_sync_s.patch @@ -1,4 +1,4 @@ -From d6b246bb7a29703f53aa4c050b8b3205d749caee Mon Sep 17 00:00:00 2001 +From fb26b5699311c41504fa7267faf27af2ab16bc88 Mon Sep 17 00:00:00 2001 From: Sushmita Susheelendra <ssusheel@codeaurora.org> Date: Fri, 15 Dec 2017 13:59:13 -0700 Subject: [PATCH] staging: android: ion: Fix dma direction for @@ -15,26 +15,27 @@ Signed-off-by: Sushmita Susheelendra <ssusheel@codeaurora.org> Cc: stable <stable@vger.kernel.org> Acked-by: Laura Abbott <labbott@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c -index a7d9b0e98572..f480885e346b 100644 +index 03d3a4fce0e2..4cf01f9d2439 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c -@@ -346,7 +346,7 @@ static int ion_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, +@@ -358,7 +358,7 @@ static int ion_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, mutex_lock(&buffer->lock); list_for_each_entry(a, &buffer->attachments, list) { dma_sync_sg_for_cpu(a->dev, a->table->sgl, a->table->nents, -- DMA_BIDIRECTIONAL); -+ direction); +- DMA_BIDIRECTIONAL); ++ direction); } mutex_unlock(&buffer->lock); -@@ -368,7 +368,7 @@ static int ion_dma_buf_end_cpu_access(struct dma_buf *dmabuf, +@@ -380,7 +380,7 @@ static int ion_dma_buf_end_cpu_access(struct dma_buf *dmabuf, mutex_lock(&buffer->lock); list_for_each_entry(a, &buffer->attachments, list) { dma_sync_sg_for_device(a->dev, a->table->sgl, a->table->nents, -- DMA_BIDIRECTIONAL); -+ direction); +- DMA_BIDIRECTIONAL); ++ direction); } mutex_unlock(&buffer->lock); |