Commit b42fa133 authored Jul 03, 2007 by Masatake YAMATO Committed by Bartlomiej Zolnierkiewicz Jul 03, 2007

ide: never called printk statement in ide-taskfile.c::wait_drive_not_busy



Look at wait_drive_not_busy in drivers/ide/ide-taskfile.c:

    static u8 wait_drive_not_busy(ide_drive_t *drive)
    {
            ide_hwif_t *hwif = HWIF(drive);
            int retries = 100;
            u8 stat;

            /*
             * Last sector was transfered, wait until drive is ready.
             * This can take up to 10 usec, but we will wait max 1 ms
             * (drive_cmd_intr() waits that long).
             */
            while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--)
                    udelay(10);

            if (!retries)
                    printk(KERN_ERR "%s: drive still BUSY!\n", drive->name);

            return stat;
    }

`printk' is never called because `retries' never holds zero at the
outside of `while' loop: when `retries' holds zero at the while's loop
condition, `retries' will hold -1 at the if condition.

Signed-off-by: Masatake YAMATO <jet@gyve.org>
Cc: Chuck Ebbert <cebbert@redhat.com>
Cc: joe@perches.com
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

parent 872aad45

drivers/ide/ide-taskfile.c

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -238,7 +238,7 @@ EXPORT_SYMBOL(task_no_data_intr);
	static u8 wait_drive_not_busy(ide_drive_t *drive)		static u8 wait_drive_not_busy(ide_drive_t *drive)
	{		{
	ide_hwif_t *hwif = HWIF(drive);		ide_hwif_t *hwif = HWIF(drive);
	int retries = 100;		int retries;
	u8 stat;		u8 stat;

	/*		/*
	@@ -246,10 +246,14 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
	* This can take up to 10 usec, but we will wait max 1 ms		* This can take up to 10 usec, but we will wait max 1 ms
	* (drive_cmd_intr() waits that long).		* (drive_cmd_intr() waits that long).
	*/		*/
	while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--)		for (retries = 0; retries < 100; retries++) {
			if ((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT)
	udelay(10);		udelay(10);
			else
			break;
			}

	if (!retries)		if (stat & BUSY_STAT)
	printk(KERN_ERR "%s: drive still BUSY!\n", drive->name);		printk(KERN_ERR "%s: drive still BUSY!\n", drive->name);

	return stat;		return stat;