Commit 0e494be7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'firewire-fixes-6.6-rc2' of... 

Merge tag 'firewire-fixes-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

Pull firewire fix from Takashi Sakamoto:
 "A change applied to v6.5 kernel brings an issue that usual GFP
  allocation is done in atomic context under acquired spin-lock. Let us
  revert it"

* tag 'firewire-fixes-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  Revert "firewire: core: obsolete usage of GFP_ATOMIC at building node tree"
parents 9608c7b7 3c70de9b

drivers/firewire/core-device.c

+1 −1
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ void fw_node_event(struct fw_card *card, struct fw_node *node, int event) 
		 * without actually having a link.

		 */

 create:

		device = kzalloc(sizeof(*device), GFP_KERNEL);

		device = kzalloc(sizeof(*device), GFP_ATOMIC);

		if (device == NULL)

			break;

drivers/firewire/core-topology.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static struct fw_node *fw_node_create(u32 sid, int port_count, int color) 
{

	struct fw_node *node;



	node = kzalloc(struct_size(node, ports, port_count), GFP_KERNEL);

	node = kzalloc(struct_size(node, ports, port_count), GFP_ATOMIC);

	if (node == NULL)

		return NULL;