Skip to content

L
linux
Commit 5e7abccd authored by Stefan Richter's avatar Stefan Richter
Browse files
Options

ieee1394: eth1394: .probe and .update may sleep 

Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent efbeccf1
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
drivers/ieee1394/eth1394.c
View file @ 5e7abccd
...@@ -354,13 +354,11 @@ static int eth1394_probe(struct device *dev) ...@@ -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) ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7