[src/trunk]: src/sys/dev/usb catch up to recent lg3303 changes

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

details:   https://anonhg.NetBSD.org/src/rev/57bd948ae38e
branches:  trunk
changeset: 767319:57bd948ae38e
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Jul 15 10:48:30 2011 +0000

description:
catch up to recent lg3303 changes

diffstat:

 sys/dev/usb/emdtv.c     |  7 ++-----
 sys/dev/usb/emdtv_dtv.c |  6 +++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diffs (55 lines):

diff -r 0b5f69a0d9a1 -r 57bd948ae38e sys/dev/usb/emdtv.c
--- a/sys/dev/usb/emdtv.c       Fri Jul 15 10:10:35 2011 +0000
+++ b/sys/dev/usb/emdtv.c       Fri Jul 15 10:48:30 2011 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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;
diff -r 0b5f69a0d9a1 -r 57bd948ae38e sys/dev/usb/emdtv_dtv.c
--- a/sys/dev/usb/emdtv_dtv.c   Fri Jul 15 10:10:35 2011 +0000
+++ b/sys/dev/usb/emdtv_dtv.c   Fri Jul 15 10:48:30 2011 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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");