From 662d416de26019f14164369108a394a43819eabb Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <s.nawrocki@samsung.com>
Date: Wed, 9 May 2012 14:33:29 +0900
Subject: [PATCH] --- yaml --- r: 310287 b: refs/heads/master c:
 82a50195cbf1197b009d42c8430a4cab24ca1480 h: refs/heads/master i:   310285:
 233f3b75f00ce38a215ad801dace37cb8d02bba4   310283:
 6f8ef7a4d8512902c20fc317655b8582233d1481   310279:
 ea7c3b40dbfab6a0080c4b62308c31ff4988ab50   310271:
 97f304f4a8226edfd912cf0c1255e07e52537530 v: v3

---
 [refs]                                        |  2 +-
 .../video/exynos/exynos_mipi_dsi_common.c     | 28 +++++++------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index c9d3cf3d39eb..cf9f70e9f3bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b89e1399bab8bf72762948d251e69df50a9d6d85
+refs/heads/master: 82a50195cbf1197b009d42c8430a4cab24ca1480
diff --git a/trunk/drivers/video/exynos/exynos_mipi_dsi_common.c b/trunk/drivers/video/exynos/exynos_mipi_dsi_common.c
index 99f645183759..47b533a183be 100644
--- a/trunk/drivers/video/exynos/exynos_mipi_dsi_common.c
+++ b/trunk/drivers/video/exynos/exynos_mipi_dsi_common.c
@@ -76,33 +76,25 @@ static unsigned int dpll_table[15] = {
 
 irqreturn_t exynos_mipi_dsi_interrupt_handler(int irq, void *dev_id)
 {
-	unsigned int intsrc = 0;
-	unsigned int intmsk = 0;
-	struct mipi_dsim_device *dsim = NULL;
-
-	dsim = dev_id;
-	if (!dsim) {
-		dev_dbg(dsim->dev, KERN_ERR "%s:error: wrong parameter\n",
-							__func__);
-		return IRQ_HANDLED;
+	struct mipi_dsim_device *dsim = dev_id;
+	unsigned int intsrc, intmsk;
+
+	if (dsim == NULL) {
+		dev_err(dsim->dev, "%s: wrong parameter\n", __func__);
+		return IRQ_NONE;
 	}
 
 	intsrc = exynos_mipi_dsi_read_interrupt(dsim);
 	intmsk = exynos_mipi_dsi_read_interrupt_mask(dsim);
+	intmsk = ~intmsk & intsrc;
 
-	intmsk = ~(intmsk) & intsrc;
-
-	switch (intmsk) {
-	case INTMSK_RX_DONE:
+	if (intsrc & INTMSK_RX_DONE) {
 		complete(&dsim_rd_comp);
 		dev_dbg(dsim->dev, "MIPI INTMSK_RX_DONE\n");
-		break;
-	case INTMSK_FIFO_EMPTY:
+	}
+	if (intsrc & INTMSK_FIFO_EMPTY) {
 		complete(&dsim_wr_comp);
 		dev_dbg(dsim->dev, "MIPI INTMSK_FIFO_EMPTY\n");
-		break;
-	default:
-		break;
 	}
 
 	exynos_mipi_dsi_clear_interrupt(dsim, intmsk);