Module Name: src
Committed By: dsl
Date: Mon Jul 9 19:10:17 UTC 2012
Modified Files:
src/sys/dev/ic: ahcisata_core.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ic/ahcisata_core.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.35 src/sys/dev/ic/ahcisata_core.c:1.36
--- src/sys/dev/ic/ahcisata_core.c:1.35 Mon Jul 2 18:15:46 2012
+++ src/sys/dev/ic/ahcisata_core.c Mon Jul 9 19:10:16 2012
@@ -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 @@ ahci_do_reset_drive(struct ata_channel *
/* 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
