On Tue, Jun 23, 2009 at 09:57:33AM +0200, Borislav Petkov wrote: > On Tue, Jun 23, 2009 at 09:51:23AM +0200, Frans Pop wrote: > > [..] > > > --- > > From: Frans Pop <elendil@xxxxxxxxx> > > Subject: ide-cd: Improve "weird block size" error message > > > > Currently the error gets repeated too frequently, for example > > each time HAL polls the device when a disc is present. Avoid that > > by using printk_once instead of printk. > > Also join the error and corrective action messages into a single line. > > > > Signed-off-by: Frans Pop <elendil@xxxxxxxxx> > > Cc: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx> > > > > diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c > > index 4a19686..7ec6996 100644 > > --- a/drivers/ide/ide-cd.c > > +++ b/drivers/ide/ide-cd.c > > @@ -886,10 +886,9 @@ static int cdrom_read_capacity(ide_drive_t *drive, unsigned long *capacity, > > case 4096: > > break; > > default: > > - printk(KERN_ERR PFX "%s: weird block size %u\n", > > + printk_once(KERN_ERR PFX "%s: weird block size %u; " > > + "setting default block size to 2048\n", > > drive->name, blocklen); > > - printk(KERN_ERR PFX "%s: default to 2kb block size\n", > > - drive->name); > Ah, nevermind! Hadn't had a coffee yet, sorry :). Acked-by: Borislav Petkov <petkovbb@xxxxxxxxx> -- Regards/Gruss, Boris. -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html