Merge branch 'samsung-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[~andy/linux] / drivers / parport / parport_pc.c

diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 8d62fb76cd41b0e0049fbce843899247cc7d9ecc..bc8ce48f07781f00dccc0c856194926562af9cc3 100644 (file)
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -1488,7 +1488,7 @@ static void __devinit winbond_check(int io, int key)
 
        outb(key, io);
        outb(key, io);     /* Write Magic Sequence to EFER, extended
-                             funtion enable register */
+                             function enable register */
        outb(0x20, io);    /* Write EFIR, extended function index register */
        devid = inb(io + 1);  /* Read EFDR, extended function data register */
        outb(0x21, io);
@@ -1527,7 +1527,7 @@ static void __devinit winbond_check2(int io, int key)
        x_oldid = inb(io + 2);
 
        outb(key, io);     /* Write Magic Byte to EFER, extended
-                             funtion enable register */
+                             function enable register */
        outb(0x20, io + 2);  /* Write EFIR, extended function index register */
        devid = inb(io + 2);  /* Read EFDR, extended function data register */
        outb(0x21, io + 1);
@@ -1569,7 +1569,7 @@ static void __devinit smsc_check(int io, int key)
 
        outb(key, io);
        outb(key, io);     /* Write Magic Sequence to EFER, extended
-                             funtion enable register */
+                             function enable register */
        outb(0x0d, io);    /* Write EFIR, extended function index register */
        oldid = inb(io + 1);  /* Read EFDR, extended function data register */
        outb(0x0e, io);
@@ -2550,7 +2550,6 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
                                         const struct parport_pc_via_data *via)
 {
        short inta_addr[6] = { 0x2A0, 0x2C0, 0x220, 0x240, 0x1E0 };
-       struct resource *base_res;
        u32 ite8872set;
        u32 ite8872_lpt, ite8872_lpthi;
        u8 ite8872_irq, type;
@@ -2561,8 +2560,7 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
 
        /* make sure which one chip */
        for (i = 0; i < 5; i++) {
-               base_res = request_region(inta_addr[i], 32, "it887x");
-               if (base_res) {
+               if (request_region(inta_addr[i], 32, "it887x")) {
                        int test;
                        pci_write_config_dword(pdev, 0x60,
                                                0xe5000000 | inta_addr[i]);
@@ -2571,7 +2569,7 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
                        test = inb(inta_addr[i]);
                        if (test != 0xff)
                                break;
-                       release_region(inta_addr[i], 0x8);
+                       release_region(inta_addr[i], 32);
                }
        }
        if (i >= 5) {
@@ -2635,7 +2633,7 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
        /*
         * Release the resource so that parport_pc_probe_port can get it.
         */
-       release_resource(base_res);
+       release_region(inta_addr[i], 32);
        if (parport_pc_probe_port(ite8872_lpt, ite8872_lpthi,
                                   irq, PARPORT_DMA_NONE, &pdev->dev, 0)) {
                printk(KERN_INFO