From 34214b0bb7bab0f38c03dc70b0d1a1ba79782404 Mon Sep 17 00:00:00 2001
From: Vinod Koul <vinod.koul@intel.com>
Date: Mon, 22 Nov 2010 10:33:40 +0000
Subject: [PATCH] --- yaml --- r: 228195 b: refs/heads/master c:
 79a35ad57300f78c7250eeeca57b602e06ff402a h: refs/heads/master i:   228193:
 2ca6b94017f95986b99e9fe671245731c411678b   228191:
 6aacaa5695eab2496e2dd5a867807e538dd4dffa v: v3

---
 [refs]                                                |  2 +-
 trunk/drivers/staging/intel_sst/intel_sst_common.h    |  3 +--
 .../staging/intel_sst/intel_sst_drv_interface.c       | 11 ++++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 95d83f90a0d2..86ad10a673e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 964c6975e8a4314c451d420f1cb54880ab535433
+refs/heads/master: 79a35ad57300f78c7250eeeca57b602e06ff402a
diff --git a/trunk/drivers/staging/intel_sst/intel_sst_common.h b/trunk/drivers/staging/intel_sst/intel_sst_common.h
index a82882423d2d..e0c6339ca0ae 100644
--- a/trunk/drivers/staging/intel_sst/intel_sst_common.h
+++ b/trunk/drivers/staging/intel_sst/intel_sst_common.h
@@ -33,10 +33,9 @@
 
 /* driver names */
 #define SST_DRV_NAME "intel_sst_driver"
-#define SST_FW_FILENAME_MRST "fw_sst_080a.bin"
-#define SST_FW_FILENAME_MFLD "fw_sst_082f.bin"
 #define SST_MRST_PCI_ID 0x080A
 #define SST_MFLD_PCI_ID 0x082F
+#define PCI_ID_LENGTH 4
 #define SST_SUSPEND_DELAY 2000
 
 enum sst_states {
diff --git a/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c b/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c
index f91c914ba209..ea8e251b5099 100644
--- a/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c
+++ b/trunk/drivers/staging/intel_sst/intel_sst_drv_interface.c
@@ -48,13 +48,14 @@ int sst_download_fw(void)
 {
 	int retval;
 	const struct firmware *fw_sst;
-	const char *name;
+	char name[20];
+
 	if (sst_drv_ctx->sst_state != SST_UN_INIT)
 		return -EPERM;
-	if (sst_drv_ctx->pci_id == SST_MRST_PCI_ID)
-		name = SST_FW_FILENAME_MRST;
-	else
-		name = SST_FW_FILENAME_MFLD;
+
+	snprintf(name, sizeof(name), "%s%04x%s", "fw_sst_",
+					sst_drv_ctx->pci_id, ".bin");
+
 	pr_debug("Downloading %s FW now...\n", name);
 	retval = request_firmware(&fw_sst, name, &sst_drv_ctx->pci->dev);
 	if (retval) {