diff options
| author | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-01-07 17:20:53 -0800 |
| commit | 351516118103c6c7bb5321aa9d5866eb3dc0d5ca (patch) | |
| tree | bf8ecc55d77847ec8299bcf964352bef38121cc5 /drivers/ata/libata-sff.c | |
| parent | c37bff78783d40d6e604129135c207e279de902f (diff) | |
| parent | bd842b53fada517017d192c8a12fc9a38e6250e1 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
arch/arm/mm/cache-v6.S
Change-Id: I1a2063218dd705a762a40f4a9dfe504ce1a1d491
Diffstat (limited to 'drivers/ata/libata-sff.c')
| -rw-r--r-- | drivers/ata/libata-sff.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index e30c537cce32..c55988b4f900 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c @@ -1532,11 +1532,10 @@ static unsigned int __ata_sff_port_intr(struct ata_port *ap, if (!(qc->dev->flags & ATA_DFLAG_CDB_INTR)) return ata_sff_idle_irq(ap); break; - case HSM_ST: - case HSM_ST_LAST: - break; - default: + case HSM_ST_IDLE: return ata_sff_idle_irq(ap); + default: + break; } /* check main status, clearing INTRQ if needed */ |