Skip to contentSkip to conversation

Missing spin_unlock_irqrestore from rrunner driver.

PATCH In review [email protected] 2 participants 3 messages Aug 11, 2003 Network drivers

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 1/1 Missing spin_unlock_irqrestore from rrunner driver.

drivers/net/rrunner.c +1 -0
diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/net/rrunner.c linux-2.5/drivers/net/rrunner.c
@@ -1645,6 +1645,7 @@ static int rr_ioctl(struct net_device *d
 			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);
#1 lore raw

[email protected] <[email protected]> :

drivers/net/rrunner.c static int rr_ioctl(struct net_device *d

Quoted 12 lines

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/drivers/net/rrunner.c linux-2.5/drivers/net/rrunner.c

drivers/net/rrunner.c +1 -1
@@ -1645,6 +1645,7 @@ static int rr_ioctl(struct net_device *d
 			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);
-

Bloat :o)

drivers/net/rrunner.c +1 -1
@@ -1641,13 +1641,13 @@ static int rr_ioctl(struct net_device *d
 
 		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;
 			goto gf_out;
 		}
-		spin_unlock_irqrestore(&rrpriv->lock, flags);
 		error = copy_to_user(rq->ifr_data, image, EEPROM_BYTES);
 		if (error)
 			error = -EFAULT;
author
#2 lore raw
Quoted 7 lines · Francois Romieu

drivers/net/rrunner.c static int rr_ioctl(struct net_device *d

Quoted 5 lines
drivers/net/rrunner.c +1 -1
+			spin_unlock_irqrestore(&rrpriv->lock, flags);
 			goto gf_out;
 		}
 		spin_unlock_irqrestore(&rrpriv->lock, flags);
-

Bloat :o)

Agreed, yours a much nicer fix.

Dave

Signature · 1 line
 Dave Jones     http://www.codemonkey.org.uk