On Wed, Nov 22, 2006 at 11:09:01AM -0700, Grant Grundler wrote:
> On Wed, Nov 22, 2006 at 05:06:07PM +0900, Hidetoshi Seto wrote:
> > --- linux-2.6.19-rc6.orig/drivers/pci/pci.c
> > +++ linux-2.6.19-rc6/drivers/pci/pci.c
> > @@ -558,12 +558,18 @@
> > {
> > int err;
> >
> > + if (dev->is_enabled)
> > + return 0;
>
> This is unfortunately going to collide with the previous
> patch posted by inaky@xxxxxxxxxxxxxxx:
>
> Subject: [patch 0/2] pci: make pci_{enable,disable}_device() be nested
Grant, you were right. This has changed the logic around this area, and
the pci_enable_device() stuff conflicts with this.
Hidetoshi, I tried to merge things together, but I think I got it wrong,
as the logic is different now. Can you please respin this patch and
resend all of them?
Sorry for the delay,
thanks,
greg k-h
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
