git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
drivers
/
ata
/
sata_mv.c
diff --git
a/drivers/ata/sata_mv.c
b/drivers/ata/sata_mv.c
index
23714ae
..
c19417e
100644
(file)
--- 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";