Module Name: src
Committed By: jakllsch
Date: Sun Apr 23 14:25:03 UTC 2017
Modified Files:
src/sys/dev/ic [jdolecek-ncq]: siisata.c
Log Message:
Use ata_kill_active() in siisata_reset_channel() so as to ensure all
in-flight xfers are taken care of.
To generate a diff of this commit:
cvs rdiff -u -r1.30.4.9 -r1.30.4.10 src/sys/dev/ic/siisata.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/siisata.c
diff -u src/sys/dev/ic/siisata.c:1.30.4.9 src/sys/dev/ic/siisata.c:1.30.4.10
--- src/sys/dev/ic/siisata.c:1.30.4.9 Sun Apr 23 01:26:50 2017
+++ src/sys/dev/ic/siisata.c Sun Apr 23 14:25:02 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.30.4.9 2017/04/23 01:26:50 jakllsch Exp $ */
+/* $NetBSD: siisata.c,v 1.30.4.10 2017/04/23 14:25:02 jakllsch Exp $ */
/* from ahcisata_core.c */
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.30.4.9 2017/04/23 01:26:50 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.30.4.10 2017/04/23 14:25:02 jakllsch Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -624,7 +624,6 @@ siisata_reset_channel(struct ata_channel
{
struct siisata_softc *sc = (struct siisata_softc *)chp->ch_atac;
struct siisata_channel *schp = (struct siisata_channel *)chp;
- struct ata_xfer *xfer;
SIISATA_DEBUG_PRINT(("%s: %s\n", SIISATANAME(sc), __func__),
DEBUG_FUNCS);
@@ -640,9 +639,7 @@ siisata_reset_channel(struct ata_channel
DELAY(10);
PRWRITE(sc, PRX(chp->ch_channel, PRO_SERROR),
PRREAD(sc, PRX(chp->ch_channel, PRO_SERROR)));
- if ((xfer = ata_queue_hwslot_to_xfer(chp->ch_queue, 0)) != NULL) { /* XXX slot */
- (*xfer->c_kill_xfer)(chp, xfer, KILL_RESET);
- }
+ ata_kill_active(chp, KILL_RESET);
return;
}
