[PATCH linux1394-2.6.git 02/15] ieee1394: eth1394: .probe and .update may sleep

[Stefan Richter]

Signed-off-by: Stefan Richter <[EMAIL PROTECTED]>
---
 drivers/ieee1394/eth1394.c |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Index: linux/drivers/ieee1394/eth1394.c
===================================================================
--- linux.orig/drivers/ieee1394/eth1394.c
+++ linux/drivers/ieee1394/eth1394.c
@@ -354,13 +354,11 @@ static int eth1394_probe(struct device *
        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_di
        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;

-- 
Stefan Richter
-=====-=-=== -=-- ---=-
http://arcgraph.de/sr/

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html