On Sul, 2005-01-16 at 13:52, James Nelson wrote: > Signed-off-by: James Nelson <[EMAIL PROTECTED]> > > diff -urN --exclude='*~' > linux-2.6.11-rc1-mm1-original/drivers/char/ftape/lowlevel/ftape-format.c > linux-2.6.11-rc1-mm1/drivers/char/ftape/lowlevel/ftape-format.c > --- linux-2.6.11-rc1-mm1-original/drivers/char/ftape/lowlevel/ftape-format.c > 2004-12-24 16:34:45.000000000 -0500 > +++ linux-2.6.11-rc1-mm1/drivers/char/ftape/lowlevel/ftape-format.c > 2005-01-16 07:32:19.293557207 -0500 > @@ -132,7 +132,7 @@ > TRACE_CATCH(ftape_seek_head_to_track(track),); > TRACE_CATCH(ftape_command(QIC_LOGICAL_FORWARD),); > spin_lock_irqsave(&ftape_format_lock, flags); > - TRACE_CATCH(fdc_setup_formatting(head), restore_flags(flags)); > + TRACE_CATCH(fdc_setup_formatting(head),); > spin_unlock_irqrestore(&ftape_format_lock, flags);
This is wrong (the original is too). TRACE_CATCH expands into code including a return so you need to replace the retore_flags(flags) with a copy of the spin_unlock_irqrestore line below - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
