From 1392d9766065e28e3e776c6641eacd608fc03e8d Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Fri, 21 Sep 2007 07:54:49 -0400 Subject: [PATCH] --- yaml --- r: 68109 b: refs/heads/master c: 24f756866676b40446e361c1f87738707161da93 h: refs/heads/master i: 68107: aec8d72b7c50d1d8aa25ce6ce694581a90be3cfa v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-scsi.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 16c54e879fc8..c01f6ac549fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00bd02027fc4a5cf92a3e538896b3642b40515df +refs/heads/master: 24f756866676b40446e361c1f87738707161da93 diff --git a/trunk/drivers/ata/libata-scsi.c b/trunk/drivers/ata/libata-scsi.c index 553488015e49..d482b589a18a 100644 --- a/trunk/drivers/ata/libata-scsi.c +++ b/trunk/drivers/ata/libata-scsi.c @@ -71,11 +71,10 @@ static int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel, #define ALL_SUB_MPAGES 0xff -static const u8 def_rw_recovery_mpage[] = { +static const u8 def_rw_recovery_mpage[RW_RECOVERY_MPAGE_LEN] = { RW_RECOVERY_MPAGE, RW_RECOVERY_MPAGE_LEN - 2, - (1 << 7) | /* AWRE, sat-r06 say it shall be 0 */ - (1 << 6), /* ARRE (auto read reallocation) */ + (1 << 7), /* AWRE */ 0, /* read retry count */ 0, 0, 0, 0, 0, /* write retry count */