lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pcmcia: allow for longer CIS firmware files

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

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski
2008-06-24 15:45:55 +02:00
parent 8b5332f699
commit feda4f2c19
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pcmcia/ds.c
View File

@@ -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;