From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Mon, 2 Apr 2007 00:13:51 +0000 (+0200)
Subject: ieee1394: eth1394: .probe and .update may sleep
X-Git-Tag: v2.6.22-rc1~1105^2~20
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5e7abccd38f7f2ce838eb49a657eea70b22f0803;p=~emulex%2Finfiniband.git

ieee1394: eth1394: .probe and .update may sleep

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---

diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index ce146b32f5c..e1fdfb5c175 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -354,13 +354,11 @@ static int eth1394_probe(struct device *dev)
 	if (!hi)
 		return -ENOENT;
 
-	new_node = kmalloc(sizeof(*new_node),
-			   in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
+	new_node = kmalloc(sizeof(*new_node), GFP_KERNEL);
 	if (!new_node)
 		return -ENOMEM;
 
-	node_info = kmalloc(sizeof(*node_info),
-			    in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
+	node_info = kmalloc(sizeof(*node_info), GFP_KERNEL);
 	if (!node_info) {
 		kfree(new_node);
 		return -ENOMEM;
@@ -435,13 +433,11 @@ static int eth1394_update(struct unit_directory *ud)
 	if (node)
 		return 0;
 
-	node = kmalloc(sizeof(*node),
-		       in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
+	node = kmalloc(sizeof(*node), GFP_KERNEL);
 	if (!node)
 		return -ENOMEM;
 
-	node_info = kmalloc(sizeof(*node_info),
-			    in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
+	node_info = kmalloc(sizeof(*node_info), GFP_KERNEL);
 	if (!node_info) {
 		kfree(node);
 		return -ENOMEM;