diff options
| -rw-r--r-- | drivers/staging/slicoss/slicoss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 79b3d1f1eff..6f5d0bff435 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c | |||
| @@ -1267,7 +1267,7 @@ static int slic_mcast_add_list(struct adapter *adapter, char *address) | |||
| 1267 | } | 1267 | } |
| 1268 | 1268 | ||
| 1269 | /* Doesn't already exist. Allocate a structure to hold it */ | 1269 | /* Doesn't already exist. Allocate a structure to hold it */ |
| 1270 | mcaddr = kmalloc(sizeof(struct mcast_address), GFP_KERNEL); | 1270 | mcaddr = kmalloc(sizeof(struct mcast_address), GFP_ATOMIC); |
| 1271 | if (mcaddr == NULL) | 1271 | if (mcaddr == NULL) |
| 1272 | return 1; | 1272 | return 1; |
| 1273 | 1273 | ||
| @@ -2291,7 +2291,7 @@ static u32 slic_card_locate(struct adapter *adapter) | |||
| 2291 | } | 2291 | } |
| 2292 | if (!physcard) { | 2292 | if (!physcard) { |
| 2293 | /* no structure allocated for this physical card yet */ | 2293 | /* no structure allocated for this physical card yet */ |
| 2294 | physcard = kzalloc(sizeof(struct physcard), GFP_KERNEL); | 2294 | physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC); |
| 2295 | ASSERT(physcard); | 2295 | ASSERT(physcard); |
| 2296 | 2296 | ||
| 2297 | physcard->next = slic_global.phys_card; | 2297 | physcard->next = slic_global.phys_card; |
