Module Name: src
Committed By: jmcneill
Date: Fri Jul 15 10:48:33 UTC 2011
Modified Files:
src/sys/dev/usb: emdtv.c emdtv_dtv.c
Log Message:
catch up to recent lg3303 changes
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/emdtv.c src/sys/dev/usb/emdtv_dtv.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/emdtv.c
diff -u src/sys/dev/usb/emdtv.c:1.2 src/sys/dev/usb/emdtv.c:1.3
--- src/sys/dev/usb/emdtv.c:1.2 Wed Jul 13 14:36:29 2011
+++ src/sys/dev/usb/emdtv.c Fri Jul 15 10:48:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv.c,v 1.2 2011/07/13 14:36:29 jakllsch Exp $ */
+/* $NetBSD: emdtv.c,v 1.3 2011/07/15 10:48:30 jmcneill Exp $ */
/*-
* Copyright (c) 2008, 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.2 2011/07/13 14:36:29 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.3 2011/07/15 10:48:30 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -164,9 +164,6 @@
"couldn't stop stream: %s\n", usbd_errstr(status));
}
- if (sc->sc_lg3303)
- lg3303_close(sc->sc_lg3303);
-
emdtv_i2c_detach(sc, flags);
return 0;
Index: src/sys/dev/usb/emdtv_dtv.c
diff -u src/sys/dev/usb/emdtv_dtv.c:1.2 src/sys/dev/usb/emdtv_dtv.c:1.3
--- src/sys/dev/usb/emdtv_dtv.c:1.2 Wed Jul 13 14:34:45 2011
+++ src/sys/dev/usb/emdtv_dtv.c Fri Jul 15 10:48:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv_dtv.c,v 1.2 2011/07/13 14:34:45 jakllsch Exp $ */
+/* $NetBSD: emdtv_dtv.c,v 1.3 2011/07/15 10:48:30 jmcneill Exp $ */
/*-
* Copyright (c) 2008, 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.2 2011/07/13 14:34:45 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.3 2011/07/15 10:48:30 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -201,7 +201,7 @@
case EMDTV_DEMOD_LG3303:
if (sc->sc_lg3303 == NULL) {
sc->sc_lg3303 = lg3303_open(sc->sc_dev,
- &sc->sc_i2c, 0x1c);
+ &sc->sc_i2c, 0x1c, 0);
}
if (sc->sc_lg3303 == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't open lg3303\n");
