From ac3d4182d4351438f74bd08a0de2810002235000 Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Fri, 28 Mar 2008 14:50:26 -0700
Subject: [PATCH] --- yaml --- r: 88020 b: refs/heads/master c:
 1424fd904c5424922f7403a21ad6419ae7e7c76e h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/usb/pegasus.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 74d3a7ff5d60..3f40f76efe0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47df976c4ef1456b39b59caf4b8fc64f77e0e5b9
+refs/heads/master: 1424fd904c5424922f7403a21ad6419ae7e7c76e
diff --git a/trunk/drivers/net/usb/pegasus.c b/trunk/drivers/net/usb/pegasus.c
index d1ed68a11e70..b588c890ea70 100644
--- a/trunk/drivers/net/usb/pegasus.c
+++ b/trunk/drivers/net/usb/pegasus.c
@@ -1128,12 +1128,8 @@ pegasus_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
 	pegasus_t *pegasus;
 
-	if (in_atomic())
-		return 0;
-
 	pegasus = netdev_priv(dev);
 	mii_ethtool_gset(&pegasus->mii, ecmd);
-
 	return 0;
 }