svn commit: r200414 - head/sys/dev/ata

[Alexander Motin]

Author: mav
Date: Fri Dec 11 16:32:59 2009
New Revision: 200414
URL: http://svn.freebsd.org/changeset/base/200414

Log:
  CFA support doesn't exclude FLUSH support.
  
  Submitted by:	Grzegorz Bernacki

Modified:
  head/sys/dev/ata/ata-disk.c

Modified: head/sys/dev/ata/ata-disk.c
==============================================================================
--- head/sys/dev/ata/ata-disk.c	Fri Dec 11 14:15:55 2009	(r200413)
+++ head/sys/dev/ata/ata-disk.c	Fri Dec 11 16:32:59 2009	(r200414)
@@ -136,10 +136,10 @@ ad_attach(device_t dev)
     adp->disk->d_fwheads = adp->heads;
     adp->disk->d_unit = device_get_unit(dev);
     if (atadev->param.support.command2 & ATA_SUPPORT_FLUSHCACHE)
-	adp->disk->d_flags = DISKFLAG_CANFLUSHCACHE;
+	adp->disk->d_flags |= DISKFLAG_CANFLUSHCACHE;
     if ((atadev->param.support.command2 & ATA_SUPPORT_CFA) ||
 	atadev->param.config == ATA_PROTO_CFA)
-	adp->disk->d_flags = DISKFLAG_CANDELETE;
+	adp->disk->d_flags |= DISKFLAG_CANDELETE;
     strlcpy(adp->disk->d_ident, atadev->param.serial,
 	sizeof(adp->disk->d_ident));
     disk_create(adp->disk, DISK_VERSION);