leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ieee1394: eth1394: .probe and .update may sleep

Browse Source 
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2007-04-02 02:13:51 +02:00
parent efbeccf174
commit 5e7abccd38
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/ieee1394/eth1394.c
View File

@ -354,13 +354,11 @@ static int eth1394_probe(struct device *dev)
if (!hi) if (!hi)
return -ENOENT; return -ENOENT;
new_node = kmalloc(sizeof(*new_node), new_node = kmalloc(sizeof(*new_node), GFP_KERNEL);
in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
if (!new_node) if (!new_node)
return -ENOMEM; return -ENOMEM;
node_info = kmalloc(sizeof(*node_info), node_info = kmalloc(sizeof(*node_info), GFP_KERNEL);
in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
if (!node_info) { if (!node_info) {
kfree(new_node); kfree(new_node);
return -ENOMEM; return -ENOMEM;
@ -435,13 +433,11 @@ static int eth1394_update(struct unit_directory *ud)
if (node) if (node)
return 0; return 0;
node = kmalloc(sizeof(*node), node = kmalloc(sizeof(*node), GFP_KERNEL);
in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
if (!node) if (!node)
return -ENOMEM; return -ENOMEM;
node_info = kmalloc(sizeof(*node_info), node_info = kmalloc(sizeof(*node_info), GFP_KERNEL);
in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
if (!node_info) { if (!node_info) {
kfree(node); kfree(node);
return -ENOMEM; return -ENOMEM;