Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / drivers / ieee1394 / eth1394.c

diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 48a7c50..95ccc69 100644 (file)
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -431,9 +431,12 @@ static int eth1394_update(struct unit_directory *ud)
                if (!node)
                        return -ENOMEM;
 
-
                node_info = kmalloc(sizeof(struct eth1394_node_info),
                                    in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
+               if (!node_info) {
+                       kfree(node);
+                       return -ENOMEM;
+                }
 
                spin_lock_init(&node_info->pdg.lock);
                INIT_LIST_HEAD(&node_info->pdg.list);