diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-29 18:27:20 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-12-01 19:06:17 -0500 |
commit | a1db5c5b75d6781e8e4dcd6621d5c10463bee0ef (patch) | |
tree | e97dd0921e1b0200255deda83911481215e01a8d /drivers/atm | |
parent | 213e85d389124f49c82d52cfb4473b8bb672f7c1 (diff) |
solos-pci: use GFP_KERNEL where possible, not GFP_ATOMIC
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/atm')
-rw-r--r-- | drivers/atm/solos-pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index 3f7c4ef1e111..e3c25dc9edc1 100644 --- a/drivers/atm/solos-pci.c +++ b/drivers/atm/solos-pci.c | |||
@@ -841,7 +841,7 @@ static int popen(struct atm_vcc *vcc) | |||
841 | return -EINVAL; | 841 | return -EINVAL; |
842 | } | 842 | } |
843 | 843 | ||
844 | skb = alloc_skb(sizeof(*header), GFP_ATOMIC); | 844 | skb = alloc_skb(sizeof(*header), GFP_KERNEL); |
845 | if (!skb) { | 845 | if (!skb) { |
846 | if (net_ratelimit()) | 846 | if (net_ratelimit()) |
847 | dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n"); | 847 | dev_warn(&card->dev->dev, "Failed to allocate sk_buff in popen()\n"); |
@@ -881,7 +881,7 @@ static void pclose(struct atm_vcc *vcc) | |||
881 | } | 881 | } |
882 | spin_unlock(&card->tx_queue_lock); | 882 | spin_unlock(&card->tx_queue_lock); |
883 | 883 | ||
884 | skb = alloc_skb(sizeof(*header), GFP_ATOMIC); | 884 | skb = alloc_skb(sizeof(*header), GFP_KERNEL); |
885 | if (!skb) { | 885 | if (!skb) { |
886 | dev_warn(&card->dev->dev, "Failed to allocate sk_buff in pclose()\n"); | 886 | dev_warn(&card->dev->dev, "Failed to allocate sk_buff in pclose()\n"); |
887 | return; | 887 | return; |
@@ -1268,7 +1268,7 @@ static int atm_init(struct solos_card *card, struct device *parent) | |||
1268 | card->atmdev[i]->phy_data = (void *)(unsigned long)i; | 1268 | card->atmdev[i]->phy_data = (void *)(unsigned long)i; |
1269 | atm_dev_signal_change(card->atmdev[i], ATM_PHY_SIG_FOUND); | 1269 | atm_dev_signal_change(card->atmdev[i], ATM_PHY_SIG_FOUND); |
1270 | 1270 | ||
1271 | skb = alloc_skb(sizeof(*header), GFP_ATOMIC); | 1271 | skb = alloc_skb(sizeof(*header), GFP_KERNEL); |
1272 | if (!skb) { | 1272 | if (!skb) { |
1273 | dev_warn(&card->dev->dev, "Failed to allocate sk_buff in atm_init()\n"); | 1273 | dev_warn(&card->dev->dev, "Failed to allocate sk_buff in atm_init()\n"); |
1274 | continue; | 1274 | continue; |