Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d7bb471 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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



Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 1574cf6c

drivers/ide/ide-iops.c

+5 −4
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive) 
	stat = hwif->tp_ops->read_status(hwif);



	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 {

		if (time_before(jiffies, hwif->poll_timeout)) {

			ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL);
@@ -558,7 +558,7 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive) 
		}

		/* end of polling */

		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);

		/* do it the old fashioned way */

		return do_reset1(drive, 1);
@@ -618,7 +618,8 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive) 
			/* continue polling */

			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++;

		err = -EIO;

	} else  {