Re: Linux v2.5.48

[Adrian Bunk <bunk@fs.tum.de>]

On Sun, Nov 17, 2002 at 08:41:05PM -0800, Linus Torvalds wrote:

>...
> Summary of changes from v2.5.47 to v2.5.48
> ============================================
>...
> Alexander Viro <viro@math.psu.edu>:
>...
>   o dv1394 devfs use
>...

This patch broke the compilation of dv1394:

<--  snip  -->

...
  gcc -Wp,-MD,drivers/ieee1394/.dv1394.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer
-fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=k6 -Iarch/i386/mach-generic -nostdinc -iwithprefix include
-DKBUILD_BASENAME=dv1394 -DKBUILD_MODNAME=dv1394   -c -o
drivers/ieee1394/dv1394.o drivers/ieee1394/dv1394.c
drivers/ieee1394/dv1394.c:2586: parse error before `return'
make[2]: *** [drivers/ieee1394/dv1394.o] Error 1

<--  snip  -->

The fix is trivial:

--- linux-2.5.48/drivers/ieee1394/dv1394.c.old	2002-11-18 13:32:02.000000000 +0100
+++ linux-2.5.48/drivers/ieee1394/dv1394.c	2002-11-18 13:35:55.000000000 +0100
@@ -2579,7 +2579,7 @@
 
 static int dv1394_devfs_add_dir(char *name)
 {
-	if (!devfs_mk_dir(NULL, name, NULL))
+	if (!devfs_mk_dir(NULL, name, NULL)) {
 		printk(KERN_ERR "dv1394: unable to create /dev/%s\n", name);
 		return -ENOMEM;
 	}


cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed