Module Name: src
Committed By: mrg
Date: Sun Feb 19 20:20:31 UTC 2012
Modified Files:
src/sys/dev/usb: umidi.c
Log Message:
fix the reversed logic in several uses of the new 'closing' member
introduced in the previous change.
from Tom Ivar Helbekkmo <[email protected]> in PR 45909. thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/usb/umidi.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/usb/umidi.c
diff -u src/sys/dev/usb/umidi.c:1.59 src/sys/dev/usb/umidi.c:1.60
--- src/sys/dev/usb/umidi.c:1.59 Tue Feb 14 19:28:22 2012
+++ src/sys/dev/usb/umidi.c Sun Feb 19 20:20:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.59 2012/02/14 19:28:22 mrg Exp $ */
+/* $NetBSD: umidi.c,v 1.60 2012/02/19 20:20:31 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.59 2012/02/14 19:28:22 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.60 2012/02/19 20:20:31 mrg Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -391,7 +391,7 @@ umidi_channelmsg(void *addr, int status,
{
struct umidi_mididev *mididev = addr;
- if (!mididev->out_jack || !mididev->opened || !mididev->closing)
+ if (!mididev->out_jack || !mididev->opened || mididev->closing)
return EIO;
return out_jack_output(mididev->out_jack, msg, len, (status>>4)&0xf);
@@ -403,7 +403,7 @@ umidi_commonmsg(void *addr, int status,
struct umidi_mididev *mididev = addr;
int cin;
- if (!mididev->out_jack || !mididev->opened || !mididev->closing)
+ if (!mididev->out_jack || !mididev->opened || mididev->closing)
return EIO;
switch ( len ) {
@@ -422,7 +422,7 @@ umidi_sysex(void *addr, u_char *msg, int
struct umidi_mididev *mididev = addr;
int cin;
- if (!mididev->out_jack || !mididev->opened || !mididev->closing)
+ if (!mididev->out_jack || !mididev->opened || mididev->closing)
return EIO;
switch ( len ) {
@@ -441,7 +441,7 @@ umidi_rtmsg(void *addr, int d)
struct umidi_mididev *mididev = addr;
u_char msg = d;
- if (!mididev->out_jack || !mididev->opened || !mididev->closing)
+ if (!mididev->out_jack || !mididev->opened || mididev->closing)
return EIO;
return out_jack_output(mididev->out_jack, &msg, 1, 0xf);
