From 985dccf5c6f9e8c6378c08b30c5354811226e1e7 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Sun, 2 Apr 2006 18:51:53 +0900 Subject: [PATCH] --- yaml --- r: 29229 b: refs/heads/master c: ea1dd4e13010eb9dd5ffb4bfabbb472bc238bebb h: refs/heads/master i: 29227: e525b5f8c70a316ff7122351cf911232fbab0e09 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 2 +- trunk/include/linux/libata.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6114a99ba230..9877d232afe7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 198e0fed9e59461fc1890dd8b75ec72d14638873 +refs/heads/master: ea1dd4e13010eb9dd5ffb4bfabbb472bc238bebb diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index 53226b16355c..985283cbcbdf 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -1241,7 +1241,7 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev, id[84], id[85], id[86], id[87], id[88]); /* initialize to-be-configured parameters */ - dev->flags = 0; + dev->flags &= ~ATA_DFLAG_CFG_MASK; dev->max_sectors = 0; dev->cdb_len = 0; dev->n_sectors = 0; diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index 890262f44d0a..cbbc821fe22c 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -122,6 +122,7 @@ enum { /* struct ata_device stuff */ ATA_DFLAG_LBA = (1 << 0), /* device supports LBA */ ATA_DFLAG_LBA48 = (1 << 1), /* device supports LBA48 */ + ATA_DFLAG_CFG_MASK = (1 << 8) - 1, ATA_DFLAG_PIO = (1 << 8), /* device currently in PIO mode */