Skip to content

Commit 06f4543

Browse files
committed
firewire: core: obsolete usage of GFP_ATOMIC at building node tree
The flag of GFP_ATOMIC is given to the call of kmalloc when building node tree, but the call is not atomic context. The call of fw_core_handle_bus_reset() and fw_core_remove_card() builds the tree, while they are done in specific workqueue or pci remove callback. This commit obsolete the usage of GFP_ATOMIC. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Sakamoto <[email protected]>
1 parent 5716e58 commit 06f4543

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/firewire/core-device.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event)
12111211
* without actually having a link.
12121212
*/
12131213
create:
1214-
device = kzalloc(sizeof(*device), GFP_ATOMIC);
1214+
device = kzalloc(sizeof(*device), GFP_KERNEL);
12151215
if (device == NULL)
12161216
break;
12171217

drivers/firewire/core-topology.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ static struct fw_node *fw_node_create(u32 sid, int port_count, int color)
101101
{
102102
struct fw_node *node;
103103

104-
node = kzalloc(struct_size(node, ports, port_count), GFP_ATOMIC);
104+
node = kzalloc(struct_size(node, ports, port_count), GFP_KERNEL);
105105
if (node == NULL)
106106
return NULL;
107107

0 commit comments

Comments
 (0)