---

yaml --- r: 180398 b: refs/heads/master c: 3fdde0a h: refs/heads/master v: v3
git-mirror · Feb 4, 2010 · 33b544f · 33b544f
1 parent fa04a4d
commit 33b544f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 454debe45c86102528c90c12eb6a99245b773bfe
+refs/heads/master: 3fdde0a1602d20c02a7d66e07ab6718ab8d79b12
diff --git a/trunk/net/irda/irnet/irnet_ppp.c b/trunk/net/irda/irnet/irnet_ppp.c
@@ -698,9 +698,11 @@ dev_irnet_ioctl(
 
       /* Query PPP channel and unit number */
     case PPPIOCGCHAN:
+      lock_kernel();
       if(ap->ppp_open && !put_user(ppp_channel_index(&ap->chan),
 						(int __user *)argp))
 	err = 0;
+      unlock_kernel();
       break;
     case PPPIOCGUNIT:
       lock_kernel();