diff options
Diffstat (limited to 'drivers/staging/slicoss/slicoss.c')
-rw-r--r-- | drivers/staging/slicoss/slicoss.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index ab3f98902a3..0d1189cd5c7 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c | |||
@@ -1492,7 +1492,7 @@ static int slic_mcast_add_list(struct adapter *adapter, char *address) | |||
1492 | } | 1492 | } |
1493 | 1493 | ||
1494 | /* Doesn't already exist. Allocate a structure to hold it */ | 1494 | /* Doesn't already exist. Allocate a structure to hold it */ |
1495 | mcaddr = kmalloc(sizeof(struct mcast_address), GFP_ATOMIC); | 1495 | mcaddr = kmalloc(sizeof(struct mcast_address), GFP_KERNEL); |
1496 | if (mcaddr == NULL) | 1496 | if (mcaddr == NULL) |
1497 | return 1; | 1497 | return 1; |
1498 | 1498 | ||
@@ -2648,7 +2648,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter) | |||
2648 | 2648 | ||
2649 | #if SLIC_DUMP_ENABLED | 2649 | #if SLIC_DUMP_ENABLED |
2650 | if (!card->dumpbuffer) { | 2650 | if (!card->dumpbuffer) { |
2651 | card->dumpbuffer = kmalloc(DUMP_PAGE_SIZE, GFP_ATOMIC); | 2651 | card->dumpbuffer = kmalloc(DUMP_PAGE_SIZE, GFP_KERNEL); |
2652 | 2652 | ||
2653 | ASSERT(card->dumpbuffer); | 2653 | ASSERT(card->dumpbuffer); |
2654 | if (card->dumpbuffer == NULL) | 2654 | if (card->dumpbuffer == NULL) |
@@ -2667,7 +2667,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter) | |||
2667 | * Allocate COMMAND BUFFER | 2667 | * Allocate COMMAND BUFFER |
2668 | */ | 2668 | */ |
2669 | if (!card->cmdbuffer) { | 2669 | if (!card->cmdbuffer) { |
2670 | card->cmdbuffer = kmalloc(sizeof(struct dump_cmd), GFP_ATOMIC); | 2670 | card->cmdbuffer = kmalloc(sizeof(struct dump_cmd), GFP_KERNEL); |
2671 | 2671 | ||
2672 | ASSERT(card->cmdbuffer); | 2672 | ASSERT(card->cmdbuffer); |
2673 | if (card->cmdbuffer == NULL) | 2673 | if (card->cmdbuffer == NULL) |
@@ -2808,7 +2808,7 @@ static u32 slic_card_locate(struct adapter *adapter) | |||
2808 | } | 2808 | } |
2809 | if (!physcard) { | 2809 | if (!physcard) { |
2810 | /* no structure allocated for this physical card yet */ | 2810 | /* no structure allocated for this physical card yet */ |
2811 | physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC); | 2811 | physcard = kzalloc(sizeof(struct physcard), GFP_KERNEL); |
2812 | ASSERT(physcard); | 2812 | ASSERT(physcard); |
2813 | 2813 | ||
2814 | DBG_MSG | 2814 | DBG_MSG |