[Meego-kernel] [PATCH 3/3] Intel MID I2S fix Fabric Error when runtime_pm is ON

[Bensaid, Selma]

Hi,

Please find attached a patch that fix i2s_int to avoid Fabric Error when runtime_pm is ON.

Thanks,

Selma.

>From 9a879a96f35a45c782f7a7a7683c9a969fe51fd3 Mon Sep 17 00:00:00 2001
From: Selma Bensaid <selma.bensaid at intel.com>
Date: Fri, 3 Dec 2010 17:57:15 +0100
Subject: [PATCH 3/3] Intel MID I2S fix i2s_int to avoid Fabric Error
 When runtime_pm is ON.

In function i2s_int, the read of the SSR register has to be
performed only if the SSP is not SUSPENDED.

Signed-off-by: Selma Bensaid <selma.bensaid at intel.com>
---
 sound/pci/intel_mid_i2s/intel_mid_i2s.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/pci/intel_mid_i2s/intel_mid_i2s.c b/sound/pci/intel_mid_i2s/intel_mid_i2s.c
index 7563c78..dde97f8 100644
--- a/sound/pci/intel_mid_i2s/intel_mid_i2s.c
+++ b/sound/pci/intel_mid_i2s/intel_mid_i2s.c
@@ -18,7 +18,6 @@
   */
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
-#include <linux/interrupt.h>
 #include <linux/pm_runtime.h>
 #include <linux/pci_regs.h>
 #include <linux/wait.h>
@@ -1029,8 +1028,6 @@ static irqreturn_t i2s_int(int irq, void *dev_id)
 	u32 irq_status = 0;
 	u32 mask_status = 0;
 	struct device *ddbg = &(drv_data->pdev->dev);
-	reg = drv_data->ioaddr;
-	irq_status = read_SSSR(reg);
 
 
 	if (ddbg->power.status!=DPM_ON)
@@ -1040,6 +1037,9 @@ static irqreturn_t i2s_int(int irq, void *dev_id)
 		return IRQ_NONE;
 #endif
 
+	reg = drv_data->ioaddr;
+	irq_status = read_SSSR(reg);
+
 	if (!(irq_status & (drv_data->mask_sr))) {
 		return IRQ_NONE;
 	} else {
-- 
1.7.2.3

---------------------------------------------------------------------
Intel Corporation SAS (French simplified joint stock company)
Registered headquarters: "Les Montalets"- 2, rue de Paris, 
92196 Meudon Cedex, France
Registration Number:  302 456 199 R.C.S. NANTERRE
Capital: 4,572,000 Euros

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-Intel-MID-I2S-fix-i2s_int-to-avoid-Fabric-Error.patch
Type: application/octet-stream
Size: 1440 bytes
Desc: 0003-Intel-MID-I2S-fix-i2s_int-to-avoid-Fabric-Error.patch
URL: <http://lists.meego.com/pipermail/meego-kernel/attachments/20101203/f3989661/attachment.obj>