Module Name: src
Committed By: skrll
Date: Sat May 9 09:35:20 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: uaudio.c ugen.c
Log Message:
Use NULL not 0 for pointer comparison
To generate a diff of this commit:
cvs rdiff -u -r1.140.2.8 -r1.140.2.9 src/sys/dev/usb/uaudio.c
cvs rdiff -u -r1.126.2.8 -r1.126.2.9 src/sys/dev/usb/ugen.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/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.140.2.8 src/sys/dev/usb/uaudio.c:1.140.2.9
--- src/sys/dev/usb/uaudio.c:1.140.2.8 Mon Apr 6 15:18:13 2015
+++ src/sys/dev/usb/uaudio.c Sat May 9 09:35:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.140.2.8 2015/04/06 15:18:13 skrll Exp $ */
+/* $NetBSD: uaudio.c,v 1.140.2.9 2015/05/09 09:35:20 skrll Exp $ */
/*
* Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.140.2.8 2015/04/06 15:18:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.140.2.9 2015/05/09 09:35:20 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2751,7 +2751,7 @@ uaudio_chan_alloc_buffers(struct uaudio_
size = (ch->bytes_per_frame + ch->sample_size) * UAUDIO_NFRAMES;
for (i = 0; i < UAUDIO_NCHANBUFS; i++) {
xfer = usbd_alloc_xfer(sc->sc_udev);
- if (xfer == 0)
+ if (xfer == NULL)
goto bad;
ch->chanbufs[i].xfer = xfer;
tbuf = usbd_alloc_buffer(xfer, size);
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.126.2.8 src/sys/dev/usb/ugen.c:1.126.2.9
--- src/sys/dev/usb/ugen.c:1.126.2.8 Sat Mar 21 11:33:37 2015
+++ src/sys/dev/usb/ugen.c Sat May 9 09:35:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.126.2.8 2015/03/21 11:33:37 skrll Exp $ */
+/* $NetBSD: ugen.c,v 1.126.2.9 2015/05/09 09:35:20 skrll Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.126.2.8 2015/03/21 11:33:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.126.2.9 2015/05/09 09:35:20 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -464,7 +464,7 @@ ugenopen(dev_t dev, int flag, int mode,
for(i = 0; i < UGEN_NISOREQS; ++i) {
sce->isoreqs[i].sce = sce;
xfer = usbd_alloc_xfer(sc->sc_udev);
- if (xfer == 0)
+ if (xfer == NULL)
goto bad;
sce->isoreqs[i].xfer = xfer;
tbuf = usbd_alloc_buffer
@@ -720,7 +720,7 @@ ugen_do_read(struct ugen_softc *sc, int
break;
}
xfer = usbd_alloc_xfer(sc->sc_udev);
- if (xfer == 0)
+ if (xfer == NULL)
return ENOMEM;
while ((n = min(UGEN_BBSIZE, uio->uio_resid)) != 0) {
DPRINTFN(1, ("ugenread: start transfer %d bytes\n",n));
@@ -934,7 +934,7 @@ ugen_do_write(struct ugen_softc *sc, int
break;
}
xfer = usbd_alloc_xfer(sc->sc_udev);
- if (xfer == 0)
+ if (xfer == NULL)
return EIO;
while ((n = min(UGEN_BBSIZE, uio->uio_resid)) != 0) {
error = uiomove(sc->sc_buffer, n, uio);
@@ -957,7 +957,7 @@ ugen_do_write(struct ugen_softc *sc, int
break;
case UE_INTERRUPT:
xfer = usbd_alloc_xfer(sc->sc_udev);
- if (xfer == 0)
+ if (xfer == NULL)
return EIO;
while ((n = min(UGETW(sce->edesc->wMaxPacketSize),
uio->uio_resid)) != 0) {
