From 3ac212296b8634bef4520eee040b31745d21ea25 Mon Sep 17 00:00:00 2001 From: Mark Lord Date: Wed, 16 Apr 2008 14:57:25 -0400 Subject: [PATCH] --- yaml --- r: 89292 b: refs/heads/master c: 40f0bc2d77d2d9ead3812f4eec2eefc11455e5de h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_mv.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3479662babc3..393600768498 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17c5aab5b34e351531466e35b154ca86db7d46a9 +refs/heads/master: 40f0bc2d77d2d9ead3812f4eec2eefc11455e5de diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c index 89a798221a6c..162260d6fe19 100644 --- a/trunk/drivers/ata/sata_mv.c +++ b/trunk/drivers/ata/sata_mv.c @@ -42,6 +42,8 @@ 6) Add port multiplier support (intermediate) + 7) Fix/reenable hot plug/unplug (should happen as a side-effect of (2) above). + 8) Develop a low-power-consumption strategy, and implement it. 9) [Experiment, low priority] See if ATAPI can be supported using @@ -296,7 +298,9 @@ enum { EDMA_ERR_IRQ_TRANSIENT = EDMA_ERR_LNK_CTRL_RX_0 | EDMA_ERR_LNK_CTRL_RX_1 | EDMA_ERR_LNK_CTRL_RX_3 | - EDMA_ERR_LNK_CTRL_TX, + EDMA_ERR_LNK_CTRL_TX | + /* temporary, until we fix hotplug: */ + (EDMA_ERR_DEV_DCON | EDMA_ERR_DEV_CON), EDMA_EH_FREEZE = EDMA_ERR_D_PAR | EDMA_ERR_PRD_PAR |