[src/trunk]: src/sys/dev/ic This a 'quick fix' for the breakage in rev 1.35.

[dsl <dsl%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9fe7c5008b28
branches:  trunk
changeset: 780055:9fe7c5008b28
user:      dsl <dsl%NetBSD.org@localhost>
date:      Mon Jul 09 19:10:16 2012 +0000

description:
This a 'quick fix' for the breakage in rev 1.35.
Patch from Manuel on current-users mailing list.
Probably requires further investigation, but is a little nicer than
reverting the previous change.

diffstat:

 sys/dev/ic/ahcisata_core.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r decdd6549c37 -r 9fe7c5008b28 sys/dev/ic/ahcisata_core.c
--- a/sys/dev/ic/ahcisata_core.c        Mon Jul 09 18:12:11 2012 +0000
+++ b/sys/dev/ic/ahcisata_core.c        Mon Jul 09 19:10:16 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ahcisata_core.c,v 1.35 2012/07/02 18:15:46 bouyer Exp $        */
+/*     $NetBSD: ahcisata_core.c,v 1.36 2012/07/09 19:10:16 dsl Exp $   */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.35 2012/07/02 18:15:46 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.36 2012/07/09 19:10:16 dsl Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
@@ -642,8 +642,7 @@
        /* clear port interrupt register */
        AHCI_WRITE(sc, AHCI_P_IS(chp->ch_channel), 0xffffffff);
        /* clear SErrors and start operations */
-       if ((sc->sc_ahci_cap & (AHCI_CAP_SPM | AHCI_CAP_CLO)) ==
-           (AHCI_CAP_SPM | AHCI_CAP_CLO)) {
+       if ((sc->sc_ahci_cap & AHCI_CAP_CLO) == AHCI_CAP_CLO) {
                /*
                 * issue a command list override to clear BSY.
                 * This is needed if there's a PMP with no drive