From 33b544fc2cba97b0b4121fb344157a6eff0623bd Mon Sep 17 00:00:00 2001
From: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Date: Mon, 1 Feb 2010 08:21:35 +0000
Subject: [PATCH] --- yaml --- r: 180398 b: refs/heads/master c:
 3fdde0a1602d20c02a7d66e07ab6718ab8d79b12 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/net/irda/irnet/irnet_ppp.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c4129181a397..2825fe746638 100644
--- 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
index 7c22c126f0ea..6b3602de359a 100644
--- 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();