diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-08-04 15:05:39 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-04 15:05:39 +0900 |
| commit | 00111076f725ec498f5ada19cdd984d111b0e9b3 (patch) | |
| tree | d7d08779bfc836382537c23298613f5948368bdc /drivers/ata/sata_mv.c | |
| parent | 133b170f08d6c20578f25b1ae71f80a5e638ccb6 (diff) | |
| parent | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (diff) | |
| download | kernel-crypto-00111076f725ec498f5ada19cdd984d111b0e9b3.tar.gz kernel-crypto-00111076f725ec498f5ada19cdd984d111b0e9b3.tar.xz kernel-crypto-00111076f725ec498f5ada19cdd984d111b0e9b3.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 into sh/hwblk
Diffstat (limited to 'drivers/ata/sata_mv.c')
| -rw-r--r-- | drivers/ata/sata_mv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 23714aefb82..c19417e0220 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -2514,7 +2514,7 @@ static void mv_unexpected_intr(struct ata_port *ap, int edma_was_enabled) char *when = "idle"; ata_ehi_clear_desc(ehi); - if (!ap || (ap->flags & ATA_FLAG_DISABLED)) { + if (ap->flags & ATA_FLAG_DISABLED) { when = "disabled"; } else if (edma_was_enabled) { when = "EDMA enabled"; |