lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: fix printk() levels in [atapi_]reset_pollfunc()

Browse Source 
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2009-03-24 23:22:47 +01:00
parent 1574cf6cb4
commit 4d7bb471ce
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/ide/ide-iops.c
View File

@@ -549,7 +549,7 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive)
stat = hwif->tp_ops->read_status(hwif); stat = hwif->tp_ops->read_status(hwif);
if (OK_STAT(stat, 0, ATA_BUSY)) if (OK_STAT(stat, 0, ATA_BUSY))
printk("%s: ATAPI reset complete\n", drive->name); printk(KERN_INFO "%s: ATAPI reset complete\n", drive->name);
else { else {
if (time_before(jiffies, hwif->poll_timeout)) { if (time_before(jiffies, hwif->poll_timeout)) {
ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL); ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL);
@@ -558,8 +558,8 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive)
} }
/* end of polling */ /* end of polling */
hwif->polling = 0; hwif->polling = 0;
printk("%s: ATAPI reset timed-out, status=0x%02x\n", printk(KERN_ERR "%s: ATAPI reset timed-out, status=0x%02x\n",
drive->name, stat); drive->name, stat);
/* do it the old fashioned way */ /* do it the old fashioned way */
return do_reset1(drive, 1); return do_reset1(drive, 1);
} }
@@ -618,7 +618,8 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)
/* continue polling */ /* continue polling */
return ide_started; return ide_started;
} }
printk("%s: reset timed-out, status=0x%02x\n", hwif->name, tmp); printk(KERN_ERR "%s: reset timed-out, status=0x%02x\n",
hwif->name, tmp);
drive->failures++; drive->failures++;
err = -EIO; err = -EIO;
} else { } else {