svn commit: r200862 - stable/8/sys/dev/ata

Alexander Motin mav at FreeBSD.org
Tue Dec 22 20:00:20 UTC 2009


Author: mav
Date: Tue Dec 22 20:00:20 2009
New Revision: 200862
URL: http://svn.freebsd.org/changeset/base/200862

Log:
  MFC r200414:
  CFA support doesn't exclude FLUSH support.

Modified:
  stable/8/sys/dev/ata/ata-disk.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/ata/ata-disk.c
==============================================================================
--- stable/8/sys/dev/ata/ata-disk.c	Tue Dec 22 19:59:01 2009	(r200861)
+++ stable/8/sys/dev/ata/ata-disk.c	Tue Dec 22 20:00:20 2009	(r200862)
@@ -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);


More information about the svn-src-stable mailing list