diff options
| author | Frans Pop <elendil@planet.nl> | 2009-06-23 16:02:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-24 00:32:31 -0700 |
| commit | d9ae62433e46909fc9e7d97ce74202c2851667b8 (patch) | |
| tree | 3d567816d2791e31e2fcfd53c54e2ea90223a69e /drivers/ide | |
| parent | af054ed0018f0a69f8ea6f7546cbf34385edf13b (diff) | |
| download | linux-d9ae62433e46909fc9e7d97ce74202c2851667b8.tar.bz2 | |
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@planet.nl>
Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-cd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index a9a1bfb14e7c..f0ede5953af8 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -889,10 +889,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); blocklen = 2048; break; } |