From patchwork Sat May 1 04:03:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 96156 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4144T4L018944 for ; Sat, 1 May 2010 04:04:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750727Ab0EAEE2 (ORCPT ); Sat, 1 May 2010 00:04:28 -0400 Received: from g1t0029.austin.hp.com ([15.216.28.36]:37531 "EHLO g1t0029.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750713Ab0EAEE2 (ORCPT ); Sat, 1 May 2010 00:04:28 -0400 Received: from g1t0038.austin.hp.com (g1t0038.austin.hp.com [16.236.32.44]) by g1t0029.austin.hp.com (Postfix) with ESMTP id 7532238253; Sat, 1 May 2010 04:04:27 +0000 (UTC) Received: from ldl (ldl.fc.hp.com [15.11.146.30]) by g1t0038.austin.hp.com (Postfix) with ESMTP id C481D30120; Sat, 1 May 2010 04:04:26 +0000 (UTC) Received: from localhost (ldl.fc.hp.com [127.0.0.1]) by ldl (Postfix) with ESMTP id AA143CF0015; Fri, 30 Apr 2010 22:04:26 -0600 (MDT) Received: from ldl ([127.0.0.1]) by localhost (ldl.fc.hp.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5FafiYBveZaP; Fri, 30 Apr 2010 22:04:26 -0600 (MDT) Received: from [192.168.1.2] (squirrel.fc.hp.com [15.11.146.57]) by ldl (Postfix) with ESMTP id 2598CCF0009; Fri, 30 Apr 2010 22:04:26 -0600 (MDT) Subject: Re: linux pnp bug - report From: Bjorn Helgaas To: Pavel Kysilka Cc: linux-acpi@vger.kernel.org In-Reply-To: <1272655284.3607.6.camel@goldenfish.development.local> References: <1269373637.3113.12.camel@goldenfish.development.local> <201003251611.41000.bjorn.helgaas@hp.com> <1269716956.2355.5.camel@goldenfish.development.local> <201004281457.59128.bjorn.helgaas@hp.com> <1272655284.3607.6.camel@goldenfish.development.local> Date: Fri, 30 Apr 2010 22:03:03 -0600 Message-Id: <1272686583.28149.53.camel@dc7800.home> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 01 May 2010 04:04:41 +0000 (UTC) diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index 2e54e6a..e3446ab 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c @@ -211,6 +211,8 @@ int pnp_check_port(struct pnp_dev *dev, struct resource *res) if (tres->flags & IORESOURCE_IO) { if (cannot_compare(tres->flags)) continue; + if (tres->flags & IORESOURCE_WINDOW) + continue; tport = &tres->start; tend = &tres->end; if (ranged_conflict(port, end, tport, tend)) @@ -271,6 +273,8 @@ int pnp_check_mem(struct pnp_dev *dev, struct resource *res) if (tres->flags & IORESOURCE_MEM) { if (cannot_compare(tres->flags)) continue; + if (tres->flags & IORESOURCE_WINDOW) + continue; taddr = &tres->start; tend = &tres->end; if (ranged_conflict(addr, end, taddr, tend))