Browse Source

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>
Dominik Brodowski 17 years ago
parent
commit
feda4f2c19
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/pcmcia/ds.c

+ 2 - 2
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;
 	struct pcmcia_socket *s = dev->socket;
 	const struct firmware *fw;
 	const struct firmware *fw;
-	char path[20];
+	char path[FIRMWARE_NAME_MAX];
 	int ret = -ENOMEM;
 	int ret = -ENOMEM;
 	int no_funcs;
 	int no_funcs;
 	int old_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);
 	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",
 		printk(KERN_WARNING "pcmcia: CIS filename is too long [%s]\n",
 			filename);
 			filename);
 		return -EINVAL;
 		return -EINVAL;