On Tue, 08 Feb 2005 10:53:56 -0500, Prarit Bhargava <[EMAIL PROTECTED]> wrote: > Bartlomiej pointed out that the sgiioc4.c changes have made their way ^^^^^^^^ all changes
> into Linus' tree. > > Here's an updated change set. > > Thanks, > > P. > > > Signed-off-by: Prarit Bhargava <[EMAIL PROTECTED]> > > ===== ide-probe.c 1.90 vs edited ===== > --- 1.90/drivers/ide/ide-probe.c 2004-12-10 14:12:14 -05:00 > +++ edited/ide-probe.c 2005-02-08 10:41:46 -05:00 > @@ -841,7 +841,10 @@ > if (fixup) > fixup(hwif); > > - hwif_init(hwif); > + if (hwif_init(hwif) < 0) { > + printk("%s: Failed to initialize IDE interface\n", > hwif->name); > + return -1; > + } > > if (hwif->present) { > u16 unit = 0; this one chunk was in merged patch already > @@ -1245,20 +1248,22 @@ > int old_irq, unit; > > if (!hwif->present) > - return 0; > + return -ENODEV; this is wrong, there is return 1 (not 0) now because of fix needed for the previous patch (error message for interface with no drives) No problem, I can hand-merge this patch but these changes need some description, "fix hwif_init() return codes" perhaps? - To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html