diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-09-28 13:28:37 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2005-09-28 14:11:26 -0400 |
commit | 1146bc743e074760ef0dd08b3457f35a68069a54 (patch) | |
tree | db9ca4e89087f2a3d26319f5b637f958b669c414 /drivers/pcmcia/rsrc_nonstatic.c | |
parent | 664cceb0093b755739e56572b836a99104ee8a75 (diff) |
[PATCH] pcmcia: allow one port excludes
Allow for excluding only one port in /etc/pcmcia/config.otps
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/rsrc_nonstatic.c')
-rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index c42455d20eb6..7e1b7fcd8333 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c | |||
@@ -691,7 +691,7 @@ static int adjust_memory(struct pcmcia_socket *s, unsigned int action, unsigned | |||
691 | unsigned long size = end - start + 1; | 691 | unsigned long size = end - start + 1; |
692 | int ret = 0; | 692 | int ret = 0; |
693 | 693 | ||
694 | if (end <= start) | 694 | if (end < start) |
695 | return -EINVAL; | 695 | return -EINVAL; |
696 | 696 | ||
697 | down(&rsrc_sem); | 697 | down(&rsrc_sem); |
@@ -724,7 +724,7 @@ static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned long | |||
724 | unsigned long size = end - start + 1; | 724 | unsigned long size = end - start + 1; |
725 | int ret = 0; | 725 | int ret = 0; |
726 | 726 | ||
727 | if (end <= start) | 727 | if (end < start) |
728 | return -EINVAL; | 728 | return -EINVAL; |
729 | 729 | ||
730 | if (end > IO_SPACE_LIMIT) | 730 | if (end > IO_SPACE_LIMIT) |
@@ -925,7 +925,7 @@ static ssize_t store_io_db(struct class_device *class_dev, const char *buf, size | |||
925 | return -EINVAL; | 925 | return -EINVAL; |
926 | } | 926 | } |
927 | } | 927 | } |
928 | if (end_addr <= start_addr) | 928 | if (end_addr < start_addr) |
929 | return -EINVAL; | 929 | return -EINVAL; |
930 | 930 | ||
931 | ret = adjust_io(s, add, start_addr, end_addr); | 931 | 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 | |||
977 | return -EINVAL; | 977 | return -EINVAL; |
978 | } | 978 | } |
979 | } | 979 | } |
980 | if (end_addr <= start_addr) | 980 | if (end_addr < start_addr) |
981 | return -EINVAL; | 981 | return -EINVAL; |
982 | 982 | ||
983 | ret = adjust_memory(s, add, start_addr, end_addr); | 983 | ret = adjust_memory(s, add, start_addr, end_addr); |