diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pnp/resource.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index 2e54e6a23c72..e3446ab8b563 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c | |||
| @@ -211,6 +211,8 @@ int pnp_check_port(struct pnp_dev *dev, struct resource *res) | |||
| 211 | if (tres->flags & IORESOURCE_IO) { | 211 | if (tres->flags & IORESOURCE_IO) { |
| 212 | if (cannot_compare(tres->flags)) | 212 | if (cannot_compare(tres->flags)) |
| 213 | continue; | 213 | continue; |
| 214 | if (tres->flags & IORESOURCE_WINDOW) | ||
| 215 | continue; | ||
| 214 | tport = &tres->start; | 216 | tport = &tres->start; |
| 215 | tend = &tres->end; | 217 | tend = &tres->end; |
| 216 | if (ranged_conflict(port, end, tport, tend)) | 218 | if (ranged_conflict(port, end, tport, tend)) |
| @@ -271,6 +273,8 @@ int pnp_check_mem(struct pnp_dev *dev, struct resource *res) | |||
| 271 | if (tres->flags & IORESOURCE_MEM) { | 273 | if (tres->flags & IORESOURCE_MEM) { |
| 272 | if (cannot_compare(tres->flags)) | 274 | if (cannot_compare(tres->flags)) |
| 273 | continue; | 275 | continue; |
| 276 | if (tres->flags & IORESOURCE_WINDOW) | ||
| 277 | continue; | ||
| 274 | taddr = &tres->start; | 278 | taddr = &tres->start; |
| 275 | tend = &tres->end; | 279 | tend = &tres->end; |
| 276 | if (ranged_conflict(addr, end, taddr, tend)) | 280 | if (ranged_conflict(addr, end, taddr, tend)) |