[src/jdolecek-ncq]: src/sys/dev/ic prb_control need to add (or) PRB_CF_INTERR...

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

details:   https://anonhg.NetBSD.org/src/rev/b1dbc092ffc4
branches:  jdolecek-ncq
changeset: 822992:b1dbc092ffc4
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Fri Aug 04 20:53:46 2017 +0000

description:
prb_control need to add (or) PRB_CF_INTERRUPT_MASK for polled commands,
rather that set - the field may be nonzero for ATAPI or for protocol override

diffstat:

 sys/dev/ic/siisata.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 70a7785b9a1e -r b1dbc092ffc4 sys/dev/ic/siisata.c
--- a/sys/dev/ic/siisata.c      Fri Aug 04 20:49:24 2017 +0000
+++ b/sys/dev/ic/siisata.c      Fri Aug 04 20:53:46 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.30.4.32 2017/08/04 20:49:24 jdolecek Exp $ */
+/* $NetBSD: siisata.c,v 1.30.4.33 2017/08/04 20:53:46 jdolecek Exp $ */
 
 /* from ahcisata_core.c */
 
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.30.4.32 2017/08/04 20:49:24 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.30.4.33 2017/08/04 20:53:46 jdolecek Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1039,7 +1039,7 @@
 
        if (xfer->c_flags & C_POLL) {
                /* polled command, disable interrupts */
-               prb->prb_control = htole16(PRB_CF_INTERRUPT_MASK);
+               prb->prb_control |= htole16(PRB_CF_INTERRUPT_MASK);
                siisata_disable_port_interrupt(chp);
        }
 
@@ -1256,7 +1256,7 @@
 
        if (xfer->c_flags & C_POLL) {
                /* polled command, disable interrupts */
-               prb->prb_control = htole16(PRB_CF_INTERRUPT_MASK);
+               prb->prb_control |= htole16(PRB_CF_INTERRUPT_MASK);
                siisata_disable_port_interrupt(chp);
        }
 
@@ -1849,7 +1849,7 @@
 
        if (xfer->c_flags & C_POLL) {
                /* polled command, disable interrupts */
-               prbp->prb_control = htole16(PRB_CF_INTERRUPT_MASK);
+               prbp->prb_control |= htole16(PRB_CF_INTERRUPT_MASK);
                siisata_disable_port_interrupt(chp);
        }