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 ce146b32f5c5fad1dd4795d3127a5668c065044b..e1fdfb5c175dd1fa2a572a1187b88a40b5360f93 100644 (file)
--- 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;