summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2007-04-02 02:13:51 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-04-30 00:00:30 +0200
commit5e7abccd38f7f2ce838eb49a657eea70b22f0803 (patch)
tree2c678b515aeb3ff873fde33cc663a57005a8a08e
parentefbeccf174bac803421a5f35076a17af47c9ce00 (diff)
downloadblackbird-op-linux-5e7abccd38f7f2ce838eb49a657eea70b22f0803.tar.gz
blackbird-op-linux-5e7abccd38f7f2ce838eb49a657eea70b22f0803.zip
ieee1394: eth1394: .probe and .update may sleep
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r--drivers/ieee1394/eth1394.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index ce146b32f5c5..e1fdfb5c175d 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;
OpenPOWER on IntegriCloud