From 032ce75e6ae6053610b24b2f8aec8d40b07d2b5d Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 4 May 2011 10:18:42 +0100 Subject: [PATCH] --- yaml --- r: 248677 b: refs/heads/master c: 868d1721a2200244a4555193d4adc1133cfb3978 h: refs/heads/master i: 248675: 37a456cdad95c676bb1608c28eb56d10da824f88 v: v3 --- [refs] | 2 +- trunk/drivers/parport/parport_pc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1aa249cb5736..f66f18146448 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61ec9016988f5c030e96e3c8a42ee9e11b8517aa +refs/heads/master: 868d1721a2200244a4555193d4adc1133cfb3978 diff --git a/trunk/drivers/parport/parport_pc.c b/trunk/drivers/parport/parport_pc.c index a3755ffc03d4..d3c06653c473 100644 --- a/trunk/drivers/parport/parport_pc.c +++ b/trunk/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);