From bcd7fa84d64a4961cc5094ed3605987a3240b17b Mon Sep 17 00:00:00 2001 From: Aaron Lu Date: Mon, 3 Dec 2012 11:35:02 +0800 Subject: [PATCH] --- yaml --- r: 344421 b: refs/heads/master c: 5416912af75de9cba5d1c75b99a7888b0bbbd2fb h: refs/heads/master i: 344419: f074c80e9d8042b20560838587ea6b88ccb6218b v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 1 + trunk/drivers/ata/libata-eh.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4e748e5ebf2e..6712468def33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f295be25a0e7baeda1e338aeb84e16b727b78c7e +refs/heads/master: 5416912af75de9cba5d1c75b99a7888b0bbbd2fb diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index caffe73c1e4a..583f26d6d455 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -2559,6 +2559,7 @@ int ata_bus_probe(struct ata_port *ap) * bus as we may be talking too fast. */ dev->pio_mode = XFER_PIO_0; + dev->dma_mode = 0xff; /* If the controller has a pio mode setup function * then use it to set the chipset to rights. Don't diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c index e60437cd0d19..bf039b0e97b7 100644 --- a/trunk/drivers/ata/libata-eh.c +++ b/trunk/drivers/ata/libata-eh.c @@ -2657,6 +2657,7 @@ int ata_eh_reset(struct ata_link *link, int classify, * bus as we may be talking too fast. */ dev->pio_mode = XFER_PIO_0; + dev->dma_mode = 0xff; /* If the controller has a pio mode setup function * then use it to set the chipset to rights. Don't