Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...

[pandora-kernel.git] / drivers / ata / sata_sil24.c

diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 433b6b8..e925051 100644 (file)
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -1160,13 +1160,8 @@ static irqreturn_t sil24_interrupt(int irq, void *dev_instance)
 
        for (i = 0; i < host->n_ports; i++)
                if (status & (1 << i)) {
-                       struct ata_port *ap = host->ports[i];
-                       if (ap && !(ap->flags & ATA_FLAG_DISABLED)) {
-                               sil24_host_intr(ap);
-                               handled++;
-                       } else
-                               printk(KERN_ERR DRV_NAME
-                                      ": interrupt from disabled port %d\n", i);
+                       sil24_host_intr(host->ports[i]);
+                       handled++;
                }
 
        spin_unlock(&host->lock);