From 638af797b893e035beb1840e3067a8115d7ebfab Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 28 Sep 2006 17:49:22 +0900 Subject: [PATCH] --- yaml --- r: 42087 b: refs/heads/master c: 722420fe6e2ab63bebc5a9ea346016b59076d75d h: refs/heads/master i: 42085: ef200dac6368941019179308f699f04a3a1de61f 42083: cb0795a2d2ec437e3bf07d69e1d9730f22a48031 42079: 23c15fb32cef9d012fa58ba29adb3033dc9c56da v: v3 --- [refs] | 2 +- trunk/drivers/ata/sata_nv.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1f76b9b7f1b2..d5678830cb15 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90088bb41200b4da962282dfd45db82544adac3b +refs/heads/master: 722420fe6e2ab63bebc5a9ea346016b59076d75d diff --git a/trunk/drivers/ata/sata_nv.c b/trunk/drivers/ata/sata_nv.c index e5615be21565..a57710107619 100644 --- a/trunk/drivers/ata/sata_nv.c +++ b/trunk/drivers/ata/sata_nv.c @@ -442,7 +442,8 @@ static struct ata_port_info nv_port_info[] = { /* generic */ { .sht = &nv_sht, - .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, + .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | + ATA_FLAG_HRST_TO_RESUME, .pio_mask = NV_PIO_MASK, .mwdma_mask = NV_MWDMA_MASK, .udma_mask = NV_UDMA_MASK, @@ -451,7 +452,8 @@ static struct ata_port_info nv_port_info[] = { /* nforce2/3 */ { .sht = &nv_sht, - .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, + .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | + ATA_FLAG_HRST_TO_RESUME, .pio_mask = NV_PIO_MASK, .mwdma_mask = NV_MWDMA_MASK, .udma_mask = NV_UDMA_MASK, @@ -460,7 +462,8 @@ static struct ata_port_info nv_port_info[] = { /* ck804 */ { .sht = &nv_sht, - .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY, + .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | + ATA_FLAG_HRST_TO_RESUME, .pio_mask = NV_PIO_MASK, .mwdma_mask = NV_MWDMA_MASK, .udma_mask = NV_UDMA_MASK,