]> git.hungrycats.org Git - linux/commitdiff
[PATCH] Clean up missing spin_unlock_irqrestore from rrunner driver
authorFrançois Romieu <romieu@fr.zoreil.com>
Wed, 13 Aug 2003 16:23:58 +0000 (09:23 -0700)
committerLinus Torvalds <torvalds@home.osdl.org>
Wed, 13 Aug 2003 16:23:58 +0000 (09:23 -0700)
This is a cleaner fix that avoids having two separate unlock
operations.

drivers/net/rrunner.c

index 349e05c82b08001f279fd90dafb2183e738d8815..6ca8dda68f26345cd9d9379fb10e20f25c0e7b04 100644 (file)
@@ -1641,14 +1641,13 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
                spin_lock_irqsave(&rrpriv->lock, flags);
                i = rr_read_eeprom(rrpriv, 0, image, EEPROM_BYTES);
+               spin_unlock_irqrestore(&rrpriv->lock, flags);
                if (i != EEPROM_BYTES){
                        printk(KERN_ERR "%s: Error reading EEPROM\n",
                               dev->name);
                        error = -EFAULT;
-                       spin_unlock_irqrestore(&rrpriv->lock, flags);
                        goto gf_out;
                }
-               spin_unlock_irqrestore(&rrpriv->lock, flags);
                error = copy_to_user(rq->ifr_data, image, EEPROM_BYTES);
                if (error)
                        error = -EFAULT;