From: popcornmix <popcornmix@gmail.com>
Date: Mon, 4 Sep 2017 19:48:02 +0000 (+0100)
Subject: vcsm: Allow both clean and invalidate to be requested
X-Git-Tag: archive/raspbian/4.9.51-1+rpi1~6^2~114
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f65b249a7bf37f30cea64a4be631505b1379d501;p=linux-4.9.git

vcsm: Allow both clean and invalidate to be requested
---

diff --git a/drivers/char/broadcom/vc_sm/vmcs_sm.c b/drivers/char/broadcom/vc_sm/vmcs_sm.c
index 1dd5d227980a..1fe8608f462a 100644
--- a/drivers/char/broadcom/vc_sm/vmcs_sm.c
+++ b/drivers/char/broadcom/vc_sm/vmcs_sm.c
@@ -2861,7 +2861,8 @@ static long vc_sm_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 							v6_dma_clean_range((void *)base, (void *)end);
 #endif
 						/* L1/L2 cache invalidate */
-						} else if (op->invalidate_mode & 1) {
+						}
+						if (op->invalidate_mode & 1) {
 #if defined(CONFIG_CPU_CACHE_V7)
 							extern void v7_dma_inv_range(void *start, void *end);
 							v7_dma_inv_range((void *)base, (void *)end);