upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / drivers / media / video / mxb.c

diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index 5c78519..70bf1f1 100644 (file)
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -731,7 +731,7 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                t->signal = 0xffff;
                t->afc = 0;             
 
-               byte = mxb->tda9840->driver->command(mxb->tda9840,TDA9840_DETECT, NULL);
+               mxb->tda9840->driver->command(mxb->tda9840,TDA9840_DETECT, &byte);
                t->audmode = mxb->cur_mode;
                
                if( byte < 0 ) {
@@ -1012,7 +1012,7 @@ static struct saa7146_extension extension = {
        .irq_func       = NULL,
 };     
 
-int __init mxb_init_module(void) 
+static int __init mxb_init_module(void)
 {
        if( 0 != saa7146_register_extension(&extension)) {
                DEB_S(("failed to register extension.\n"));
@@ -1022,7 +1022,7 @@ int __init mxb_init_module(void)
        return 0;
 }
 
-void __exit mxb_cleanup_module(void) 
+static void __exit mxb_cleanup_module(void)
 {
        saa7146_unregister_extension(&extension);
 }