diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 14:35:33 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-02-17 18:07:04 +0100 |
| commit | f309cb3e4fe79a68cb2fdedfb8a8a950a2cfe490 (patch) | |
| tree | 83cc0345f890ded64800f81771a86b65be0b460e /drivers/pcmcia | |
| parent | pcmcia: remove useless msleep in ds.c (diff) | |
| download | linux-f309cb3e4fe79a68cb2fdedfb8a8a950a2cfe490.tar.xz linux-f309cb3e4fe79a68cb2fdedfb8a8a950a2cfe490.zip | |
pcmcia: allow for extension of resource interval
If a new interval overlaps or extends an existing interval in
add_interval(), do not fail, but extend the existing interval.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/rsrc_nonstatic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c index 19cecb539759..a06881c3b962 100644 --- a/drivers/pcmcia/rsrc_nonstatic.c +++ b/drivers/pcmcia/rsrc_nonstatic.c @@ -124,8 +124,10 @@ static int add_interval(struct resource_map *map, u_long base, u_long num) struct resource_map *p, *q; for (p = map; ; p = p->next) { - if ((p != map) && (p->base+p->num-1 >= base)) - return -1; + if ((p != map) && (p->base+p->num >= base)) { + p->num = max(num + base - p->base, p->num); + return 0; + } if ((p->next == map) || (p->next->base > base+num-1)) break; } |