aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-05-04 10:18:42 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-06 18:29:22 -0700
commit868d1721a2200244a4555193d4adc1133cfb3978 (patch)
tree8668adb836611791a9b3b1e09c7e78d15ae140e8 /drivers/parport
parent61ec9016988f5c030e96e3c8a42ee9e11b8517aa (diff)
downloadkernel_samsung_smdk4412-868d1721a2200244a4555193d4adc1133cfb3978.tar.gz
kernel_samsung_smdk4412-868d1721a2200244a4555193d4adc1133cfb3978.tar.bz2
kernel_samsung_smdk4412-868d1721a2200244a4555193d4adc1133cfb3978.zip
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>
Diffstat (limited to 'drivers/parport')
-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)
u8 origval, r;
if (verbose_probing)
printk(KERN_DEBUG "IT8705 Super-IO detection, now testing port 2E ...\n");
- if (!request_region(0x2e, 2, __func__))
+ if (!request_muxed_region(0x2e, 2, __func__))
return;
origval = inb(0x2e); /* Save original value */
outb(0x87, 0x2e);