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

ieee1394: eth1394: .probe and .update may sleep 



Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent efbeccf1

drivers/ieee1394/eth1394.c

+4 −8
Original line number Diff line number Diff line
@@ -354,13 +354,11 @@ static int eth1394_probe(struct device *dev) 
	if (!hi)

		return -ENOENT;



	new_node = kmalloc(sizeof(*new_node),

			   in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);

	new_node = kmalloc(sizeof(*new_node), GFP_KERNEL);

	if (!new_node)

		return -ENOMEM;



	node_info = kmalloc(sizeof(*node_info),

			    in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);

	node_info = kmalloc(sizeof(*node_info), GFP_KERNEL);

	if (!node_info) {

		kfree(new_node);

		return -ENOMEM;
@@ -435,13 +433,11 @@ static int eth1394_update(struct unit_directory *ud) 
	if (node)

		return 0;



	node = kmalloc(sizeof(*node),

		       in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);

	node = kmalloc(sizeof(*node), GFP_KERNEL);

	if (!node)

		return -ENOMEM;



	node_info = kmalloc(sizeof(*node_info),

			    in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);

	node_info = kmalloc(sizeof(*node_info), GFP_KERNEL);

	if (!node_info) {

		kfree(node);

		return -ENOMEM;