Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5e7abccd38f7f2ce838eb49a657eea70b22f0803
Commit:     5e7abccd38f7f2ce838eb49a657eea70b22f0803
Parent:     efbeccf174bac803421a5f35076a17af47c9ce00
Author:     Stefan Richter <[EMAIL PROTECTED]>
AuthorDate: Mon Apr 2 02:13:51 2007 +0200
Committer:  Stefan Richter <[EMAIL PROTECTED]>
CommitDate: Mon Apr 30 00:00:30 2007 +0200

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

diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index ce146b3..e1fdfb5 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to