Subject: Re: linux-next: Tree for February 20

From: Bartlomiej Zolnierkiewicz <[email-masked]>
Date: Fri, 20 Feb 2009 17:32:06 +0100

On Friday 20 February 2009, Stephen Rothwell wrote:
> Hi all,
> Changes since 20090219:

I've just noticed stall patch version in ide tree so if you're
using ide this patch is also necessary (fixes hang on boot):

--- linux-next/drivers/ide/ide-iops.c	2009-02-20 18:00:28.000000000 +0100
+++ linux-2.6.git/drivers/ide/ide-iops.c	2009-02-19 18:31:04.000000000 +0100
@@ -468,9 +468,9 @@
 	unsigned long flags;
 
 	spin_lock_irqsave(&hwif->lock, flags);
-	if ((drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT) &&
-	    (cmd->protocol == ATAPI_PROT_DMA ||
-	     cmd->protocol == ATAPI_PROT_PIO))
+	if ((cmd->protocol != ATAPI_PROT_DMA &&
+	     cmd->protocol != ATAPI_PROT_PIO) ||
+	    (drive->atapi_flags & IDE_AFLAG_DRQ_INTERRUPT))
 		__ide_set_handler(drive, handler, timeout);
 	hwif->tp_ops->exec_command(hwif, cmd->tf.command);
 	/*