From: Mark Lord Date: Wed, 16 Apr 2008 18:57:25 +0000 (-0400) Subject: sata_mv disable hotplug for now X-Git-Tag: v2.6.26-rc1~1150^2~5 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=40f0bc2d77d2d9ead3812f4eec2eefc11455e5de;p=linux-2.6-omap-h63xx.git sata_mv disable hotplug for now Disable hot plug/unplug detection in sata_mv for now. It is currently broken, and also interferes with PMP support. This will get fixed in a subsequent patch series. Signed-off-by: Mark Lord Signed-off-by: Jeff Garzik --- diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 89a798221a6..162260d6fe1 100644 --- a/drivers/ata/sata_mv.c +++ b/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 |