diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-04-01 20:13:51 -0400 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-04-29 18:00:30 -0400 |
commit | 5e7abccd38f7f2ce838eb49a657eea70b22f0803 (patch) | |
tree | 2c678b515aeb3ff873fde33cc663a57005a8a08e /drivers/ieee1394 | |
parent | efbeccf174bac803421a5f35076a17af47c9ce00 (diff) |
ieee1394: eth1394: .probe and .update may sleep
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r-- | 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 ce146b32f5c5..e1fdfb5c175d 100644 --- a/drivers/ieee1394/eth1394.c +++ b/drivers/ieee1394/eth1394.c | |||
@@ -354,13 +354,11 @@ static int eth1394_probe(struct device *dev) | |||
354 | if (!hi) | 354 | if (!hi) |
355 | return -ENOENT; | 355 | return -ENOENT; |
356 | 356 | ||
357 | new_node = kmalloc(sizeof(*new_node), | 357 | new_node = kmalloc(sizeof(*new_node), GFP_KERNEL); |
358 | in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); | ||
359 | if (!new_node) | 358 | if (!new_node) |
360 | return -ENOMEM; | 359 | return -ENOMEM; |
361 | 360 | ||
362 | node_info = kmalloc(sizeof(*node_info), | 361 | node_info = kmalloc(sizeof(*node_info), GFP_KERNEL); |
363 | in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); | ||
364 | if (!node_info) { | 362 | if (!node_info) { |
365 | kfree(new_node); | 363 | kfree(new_node); |
366 | return -ENOMEM; | 364 | return -ENOMEM; |
@@ -435,13 +433,11 @@ static int eth1394_update(struct unit_directory *ud) | |||
435 | if (node) | 433 | if (node) |
436 | return 0; | 434 | return 0; |
437 | 435 | ||
438 | node = kmalloc(sizeof(*node), | 436 | node = kmalloc(sizeof(*node), GFP_KERNEL); |
439 | in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); | ||
440 | if (!node) | 437 | if (!node) |
441 | return -ENOMEM; | 438 | return -ENOMEM; |
442 | 439 | ||
443 | node_info = kmalloc(sizeof(*node_info), | 440 | node_info = kmalloc(sizeof(*node_info), GFP_KERNEL); |
444 | in_interrupt() ? GFP_ATOMIC : GFP_KERNEL); | ||
445 | if (!node_info) { | 441 | if (!node_info) { |
446 | kfree(node); | 442 | kfree(node); |
447 | return -ENOMEM; | 443 | return -ENOMEM; |