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

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

diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index 37545ac..b577435 100644 (file)
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -60,7 +60,7 @@ static struct saa7146 saa7146s[SAA7146_MAX];
 static int saa_num = 0;                /* number of SAA7146s in use */
 
 static int video_nr = -1;
-MODULE_PARM(video_nr,"i");
+module_param(video_nr, int, 0);
 MODULE_LICENSE("GPL");
 
 
@@ -97,13 +97,6 @@ MODULE_LICENSE("GPL");
 #define debAudio       (NewCard ? nDebAudio : oDebAudio)
 #define debDMA         (NewCard ? nDebDMA : oDebDMA)
 
-#ifdef DEBUG
-int stradis_driver(void)       /* for the benefit of ksymoops */
-{
-       return 1;
-}
-#endif
-
 #ifdef USE_RESCUE_EEPROM_SDM275
 static unsigned char rescue_eeprom[64] = {
 0x00,0x01,0x04,0x13,0x26,0x0f,0x10,0x00,0x00,0x00,0x43,0x63,0x22,0x01,0x29,0x15,0x73,0x00,0x1f, 'd', 'e', 'c', 'x', 'l', 'd', 'v', 'a',0x02,0x00,0x01,0x00,0xcc,0xa4,0x63,0x09,0xe2,0x10,0x00,0x0a,0x00,0x02,0x02, 'd', 'e', 'c', 'x', 'l', 'a',0x00,0x00,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -2188,12 +2181,9 @@ static void release_saa(void)
                /* unmap and free memory */
                saa->audhead = saa->audtail = saa->osdhead = 0;
                saa->vidhead = saa->vidtail = saa->osdtail = 0;
-               if (saa->vidbuf)
-                       vfree(saa->vidbuf);
-               if (saa->audbuf)
-                       vfree(saa->audbuf);
-               if (saa->osdbuf)
-                       vfree(saa->osdbuf);
+               vfree(saa->vidbuf);
+               vfree(saa->audbuf);
+               vfree(saa->osdbuf);
                if (saa->dmavid2)
                        kfree((void *) saa->dmavid2);
                saa->audbuf = saa->vidbuf = saa->osdbuf = NULL;