[Meego-kernel] [PATCH 08/10] Audio: Fix the klockwork errors and warnings

[Koul, Vinod]

>From 5953cd210d4962ba57de63046aeabf643b15770b Mon Sep 17 00:00:00 2001
From: Vinod Koul <vinod.koul at intel.com>
Date: Wed, 22 Sep 2010 20:29:35 +0530
Subject: [PATCH 08/10] Audio: Fix the klockwork errors and warnings

This patches fixes two errors reported by klockwork tool

Signed-off-by: Vinod Koul <vinod.koul at intel.com>
---
 sound/pci/sst/intel_sst_stream.c         |    4 ----
 sound/pci/sst/intel_sst_stream_encoded.c |    4 +---
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/sound/pci/sst/intel_sst_stream.c b/sound/pci/sst/intel_sst_stream.c
index 4e7b5bc..97663a9 100644
--- a/sound/pci/sst/intel_sst_stream.c
+++ b/sound/pci/sst/intel_sst_stream.c
@@ -598,10 +598,6 @@ int sst_drain_stream(int str_id)
 	str_info->data_blk.on = true;
 	retval = sst_wait_interruptible(sst_drv_ctx, &str_info->data_blk);
 	str_info->need_draining = false;
-	if (retval == -SST_ERR_INVALID_STREAM_ID) {
-		retval = -EINVAL;
-		sst_clean_stream(str_info);
-	}
 	return retval;
 }
 
diff --git a/sound/pci/sst/intel_sst_stream_encoded.c b/sound/pci/sst/intel_sst_stream_encoded.c
index de577c9..738de71 100644
--- a/sound/pci/sst/intel_sst_stream_encoded.c
+++ b/sound/pci/sst/intel_sst_stream_encoded.c
@@ -360,7 +360,6 @@ int sst_parse_target(struct snd_sst_slot_info *slot)
 				pr_err("sst: SST_Activate_target_fail\n");
 			else
 				pr_err("sst: SST_Activate_target_pass\n");
-		return retval;
 	} else if (slot->action == SND_SST_PORT_PREPARE &&
 			slot->device_type == SND_SST_DEVICE_PCM) {
 				retval = sst_prepare_target(slot);
@@ -368,12 +367,11 @@ int sst_parse_target(struct snd_sst_slot_info *slot)
 				pr_err("sst: SST_prepare_target_fail\n");
 			else
 				pr_err("sst: SST_prepare_target_pass\n");
-			return retval;
 	} else {
 		pr_err("sst: slot_action : %d, device_type: %d\n",
 				slot->action, slot->device_type);
-		return retval;
 	}
+	return retval;
 }
 
 int sst_send_target(struct snd_sst_target_device *target)
-- 
1.6.6.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0008-Audio-Fix-the-klockwork-errors-and-warnings.patch
Type: application/octet-stream
Size: 1965 bytes
Desc: 0008-Audio-Fix-the-klockwork-errors-and-warnings.patch
URL: <http://lists.meego.com/pipermail/meego-kernel/attachments/20100927/1608f672/attachment.obj>