Messages in this thread | | | Date | Mon, 2 Jun 2008 15:23:28 -0700 | From | "Avuton Olrich" <> | Subject | Re: 53052feb6 (PNP: remove pnp_mem_flags() as an lvalue) breaks my ALSA intel8x0 sound card regression |
| |
On Mon, Jun 2, 2008 at 3:05 PM, Bjorn Helgaas <bjorn.helgaas@hp.com> wrote: > On Monday 02 June 2008 01:06:12 pm Rene Herman wrote: >> On 02-06-08 05:25, Avuton Olrich wrote: >> >> > On Sun, Jun 1, 2008 at 9:20 AM, Rene Herman <rene.herman@keyaccess.nl> wrote: >> >> On 01-06-08 16:42, Avuton Olrich wrote: >> >> >> >>> My intel8x0 card stops working due to a regression; bisection and >> >>> information below. > > Thank you very much for doing all the work to bisect this and write > up such a complete report. > > Can you try the patch below, please? > > PNP: mark resources that conflict with PCI devices "disabled" > > Both the PNP/PCI conflict detection quirk and the PNP system > driver must use the same mechanism to mark resources as disabled. > > I think it's best to keep the resource and to keep the type bit > (IORESOURCE_MEM, etc), so that we match the list from firmware > as closely as possible. > > Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> > > Index: work11/drivers/pnp/quirks.c > =================================================================== > --- work11.orig/drivers/pnp/quirks.c 2008-06-02 14:59:03.000000000 -0600 > +++ work11/drivers/pnp/quirks.c 2008-06-02 15:42:35.000000000 -0600 > @@ -286,7 +286,7 @@ static void quirk_system_pci_resources(s > pci_name(pdev), i, > (unsigned long long) pci_start, > (unsigned long long) pci_end); > - res->flags = 0; > + res->flags |= IORESOURCE_DISABLED; > } > } > } > Index: work11/drivers/pnp/system.c > =================================================================== > --- work11.orig/drivers/pnp/system.c 2008-06-02 14:58:56.000000000 -0600 > +++ work11/drivers/pnp/system.c 2008-06-02 15:44:36.000000000 -0600 > @@ -81,7 +81,7 @@ static void reserve_resources_of_dev(str > } > > for (i = 0; (res = pnp_get_resource(dev, IORESOURCE_MEM, i)); i++) { > - if (res->flags & IORESOURCE_UNSET) > + if (res->flags & IORESOURCE_DISABLED) > continue; > > reserve_range(dev, res->start, res->end, 0); >
Sweet! That works, thanks for the quick fix. Feel free to add me as Tested-by:. -- avuton -- "I've got a fever. And the only prescription is more cowbell." -- Christopher Walken
| |