Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7ed550b authored by Lior Dotan's avatar Lior Dotan Committed by Greg Kroah-Hartman
Browse files

Revert Staging: SLICOSS: use gfp_kernel where possible 



Revert commit 2bb34736

This commit has been reported to cause problems:
  Mar 24 11:50:31 linuxdev kernel: BUG: sleeping function called from invalid context at mm/slub.c:1599 Mar 24 11:50:31 linuxdev kernel: in_atomic(): 1, irqs_disabled(): 0, pid: 3251, name: avahi-daemon

Cc: Lior Dotan <liodot@gmail.com>
Cc: Christopher Harrer <charrer@alacritech.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d203eea8

drivers/staging/slicoss/slicoss.c

+2 −2
Original line number Diff line number Diff line
@@ -1267,7 +1267,7 @@ static int slic_mcast_add_list(struct adapter *adapter, char *address) 
	}



	/* Doesn't already exist.  Allocate a structure to hold it */

	mcaddr = kmalloc(sizeof(struct mcast_address), GFP_KERNEL);

	mcaddr = kmalloc(sizeof(struct mcast_address), GFP_ATOMIC);

	if (mcaddr == NULL)

		return 1;
@@ -2291,7 +2291,7 @@ static u32 slic_card_locate(struct adapter *adapter) 
	}

	if (!physcard) {

		/* no structure allocated for this physical card yet */

		physcard = kzalloc(sizeof(struct physcard), GFP_KERNEL);

		physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC);

		ASSERT(physcard);



		physcard->next = slic_global.phys_card;