aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-05-04 05:18:42 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-06 21:29:22 -0400
commit868d1721a2200244a4555193d4adc1133cfb3978 (patch)
tree8668adb836611791a9b3b1e09c7e78d15ae140e8
parent61ec9016988f5c030e96e3c8a42ee9e11b8517aa (diff)
parport: Use request_muxed_region for IT87 probe and lock
This is needed as part of making the various IT87 drivers actually co-exist politely with each other, and with other superio devices that may be muxed on 0x2E/0x2F. It can be applied before or after the other patches by Nat Gurumoorthy without problem. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/parport/parport_pc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index a3755ffc03d..d3c06653c47 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -1621,7 +1621,7 @@ static void __devinit detect_and_report_it87(void)
1621 u8 origval, r; 1621 u8 origval, r;
1622 if (verbose_probing) 1622 if (verbose_probing)
1623 printk(KERN_DEBUG "IT8705 Super-IO detection, now testing port 2E ...\n"); 1623 printk(KERN_DEBUG "IT8705 Super-IO detection, now testing port 2E ...\n");
1624 if (!request_region(0x2e, 2, __func__)) 1624 if (!request_muxed_region(0x2e, 2, __func__))
1625 return; 1625 return;
1626 origval = inb(0x2e); /* Save original value */ 1626 origval = inb(0x2e); /* Save original value */
1627 outb(0x87, 0x2e); 1627 outb(0x87, 0x2e);