From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Tue, 24 Jun 2008 13:45:55 +0000 (+0200)
Subject: pcmcia: allow for longer CIS firmware files
X-Git-Tag: v2.6.27-rc1~1113^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=feda4f2c190f4efc101857935db0917ff3e4e23d;p=linux-2.6-omap-h63xx.git

pcmcia: allow for longer CIS firmware files

Don't be more zealous with memory than the firmware class core.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 461b8a9a9f3..4174d9656e3 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -850,7 +850,7 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
 {
 	struct pcmcia_socket *s = dev->socket;
 	const struct firmware *fw;
-	char path[20];
+	char path[FIRMWARE_NAME_MAX];
 	int ret = -ENOMEM;
 	int no_funcs;
 	int old_funcs;
@@ -862,7 +862,7 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename)
 
 	ds_dbg(1, "trying to load CIS file %s\n", filename);
 
-	if (strlen(filename) > 14) {
+	if (strlen(filename) > (FIRMWARE_NAME_MAX - 1)) {
 		printk(KERN_WARNING "pcmcia: CIS filename is too long [%s]\n",
 			filename);
 		return -EINVAL;