Merge branch 'linux-2.6' into for-2.6.22

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 388d07fab5f7..9d9670a9b117 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -874,8 +874,14 @@ static irqreturn_t nv_adma_interrupt(int irq, void *dev_instance)
 
                         if (status & (NV_ADMA_STAT_DONE |
                                       NV_ADMA_STAT_CPBERR)) {
-                                u32 check_commands = notifier | notifier_error;
+                                u32 check_commands;
                                 int pos, error = 0;
+
+                                if(ata_tag_valid(ap->active_tag))
+                                        check_commands = 1 << ap->active_tag;
+                                else
+                                        check_commands = ap->sactive;
+
                                 /** Check CPBs for completed commands */
                                 while ((pos = ffs(check_commands)) && !error) {
                                         pos--;