[PATCH] Re: [test11-pre2] rrunner.c compiler error

From: Bartlomiej Zolnierkiewicz (dake@staszic.waw.pl)
Date: Fri Nov 10 2000 - 09:04:44 EST

On Fri, 10 Nov 2000, Alan Cox wrote:
> > rrunner.c : In function 'rr_ioctl'
> > rrunner.c:1558: label 'out' used but not defined
> > make[2]: *** [rrunner.o] Error 1
>
> My fault. Swap that 1158 line pair
>
> error = -EPERM;
> goto out;
>
> with
> return -EPERM
>

There is also line 1566 with "goto out;" (out of memory case).
Complete bugfix:

--- linux-240t11p2/drivers/net/rrunner.c Fri Nov 10 14:28:43 2000
+++ linux/drivers/net/rrunner.c Fri Nov 10 14:50:37 2000
@@ -1554,16 +1554,14 @@
         switch(cmd){
         case SIOCRRGFW:
                 if (!capable(CAP_SYS_RAWIO)){
- error = -EPERM;
- goto out;
+ return -EPERM;
                 }
 
                 image = kmalloc(EEPROM_WORDS * sizeof(u32), GFP_KERNEL);
                 if (!image){
                         printk(KERN_ERR "%s: Unable to allocate memory "
                                "for EEPROM image\n", dev->name);
- error = -ENOMEM;
- goto out;
+ return -ENOMEM;
                 }
                 
                 spin_lock(&rrpriv->lock); 

--
Bartlomiej Zolnierkiewicz
<bkz@linux-ide.org>

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
Please read the FAQ at http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Wed Nov 15 2000 - 21:00:16 EST