Commit 0f6db2172ffa478409b5facd06bcd38a03b504f7
Committed by
Greg Kroah-Hartman
1 parent
f0e615c3cb
Exists in
master
and in
39 other branches
parport_pc.c: correctly release the requested region for the IT887x
Replace release_resource() by release_region() and also fix the inconsistency in the size of the requested/released region. The size of the resource should be 32, not 0x8 like it was corrected in commit e7c310c36e5fdf1b83a459e5db167bfbd86137db already. CC: linux-serial@vger.kernel.org Reported-by: Julia Lawall <julia@diku.dk> Signed-off-by: Niels de Vos <ndevos@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 1 changed file with 3 additions and 5 deletions Side-by-side Diff
drivers/parport/parport_pc.c
... | ... | @@ -2550,7 +2550,6 @@ |
2550 | 2550 | const struct parport_pc_via_data *via) |
2551 | 2551 | { |
2552 | 2552 | short inta_addr[6] = { 0x2A0, 0x2C0, 0x220, 0x240, 0x1E0 }; |
2553 | - struct resource *base_res; | |
2554 | 2553 | u32 ite8872set; |
2555 | 2554 | u32 ite8872_lpt, ite8872_lpthi; |
2556 | 2555 | u8 ite8872_irq, type; |
... | ... | @@ -2561,8 +2560,7 @@ |
2561 | 2560 | |
2562 | 2561 | /* make sure which one chip */ |
2563 | 2562 | for (i = 0; i < 5; i++) { |
2564 | - base_res = request_region(inta_addr[i], 32, "it887x"); | |
2565 | - if (base_res) { | |
2563 | + if (request_region(inta_addr[i], 32, "it887x")) { | |
2566 | 2564 | int test; |
2567 | 2565 | pci_write_config_dword(pdev, 0x60, |
2568 | 2566 | 0xe5000000 | inta_addr[i]); |
... | ... | @@ -2571,7 +2569,7 @@ |
2571 | 2569 | test = inb(inta_addr[i]); |
2572 | 2570 | if (test != 0xff) |
2573 | 2571 | break; |
2574 | - release_region(inta_addr[i], 0x8); | |
2572 | + release_region(inta_addr[i], 32); | |
2575 | 2573 | } |
2576 | 2574 | } |
2577 | 2575 | if (i >= 5) { |
... | ... | @@ -2635,7 +2633,7 @@ |
2635 | 2633 | /* |
2636 | 2634 | * Release the resource so that parport_pc_probe_port can get it. |
2637 | 2635 | */ |
2638 | - release_resource(base_res); | |
2636 | + release_region(inta_addr[i], 32); | |
2639 | 2637 | if (parport_pc_probe_port(ite8872_lpt, ite8872_lpthi, |
2640 | 2638 | irq, PARPORT_DMA_NONE, &pdev->dev, 0)) { |
2641 | 2639 | printk(KERN_INFO |