1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c
index 17c116bb332c..1fd319bf758e 100644
--- a/drivers/net/ppp_async.c
+++ b/drivers/net/ppp_async.c
@@ -132,13 +132,15 @@ static DEFINE_RWLOCK(disc_data_lock);
 
 static struct asyncppp *ap_get(struct tty_struct *tty)
 {
+        unsigned long flags;
         struct asyncppp *ap;
 
-        read_lock(&disc_data_lock);
+        read_lock_irqsave(&disc_data_lock, flags);
         ap = tty->disc_data;
         if (ap != NULL)
                 atomic_inc(&ap->refcnt);
-        read_unlock(&disc_data_lock);
+        read_unlock_irqrestore(&disc_data_lock, flags);
+
         return ap;
 }
 
@@ -215,12 +217,13 @@ ppp_asynctty_open(struct tty_struct *tty)
 static void
 ppp_asynctty_close(struct tty_struct *tty)
 {
+        unsigned long flags;
         struct asyncppp *ap;
 
-        write_lock_irq(&disc_data_lock);
+        write_lock_irqsave(&disc_data_lock, flags);
         ap = tty->disc_data;
         tty->disc_data = NULL;
-        write_unlock_irq(&disc_data_lock);
+        write_unlock_irqrestore(&disc_data_lock, flags);
         if (!ap)
                 return;