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

[PATCH] pcmcia: allow one port excludes

Browse Source 
Allow for excluding only one port in /etc/pcmcia/config.otps

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski
2005-09-28 19:28:37 +02:00
parent 664cceb009
commit 1146bc743e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pcmcia/rsrc_nonstatic.c
View File

@@ -691,7 +691,7 @@ static int adjust_memory(struct pcmcia_socket *s, unsigned int action, unsigned
unsigned long size = end - start + 1; unsigned long size = end - start + 1;
int ret = 0; int ret = 0;
if (end <= start) if (end < start)
return -EINVAL; return -EINVAL;
down(&rsrc_sem); down(&rsrc_sem);
@@ -724,7 +724,7 @@ static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long
unsigned long size = end - start + 1; unsigned long size = end - start + 1;
int ret = 0; int ret = 0;
if (end <= start) if (end < start)
return -EINVAL; return -EINVAL;
if (end > IO_SPACE_LIMIT) if (end > IO_SPACE_LIMIT)
@@ -925,7 +925,7 @@ static ssize_t store_io_db(struct class_device *class_dev, const char *buf, size
return -EINVAL; return -EINVAL;
} }
} }
if (end_addr <= start_addr) if (end_addr < start_addr)
return -EINVAL; return -EINVAL;
ret = adjust_io(s, add, start_addr, end_addr); ret = adjust_io(s, add, start_addr, end_addr);
@@ -977,7 +977,7 @@ static ssize_t store_mem_db(struct class_device *class_dev, const char *buf, siz
return -EINVAL; return -EINVAL;
} }
} }
if (end_addr <= start_addr) if (end_addr < start_addr)
return -EINVAL; return -EINVAL;
ret = adjust_memory(s, add, start_addr, end_addr); ret = adjust_memory(s, add, start_addr, end_addr);