aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarolyn Wyborny <carolyn.wyborny@intel.com>2013-01-23 03:43:01 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-02-15 01:11:56 -0800
commit199f6ccac11e93761ee24e35c621992c078fe76f (patch)
tree2e84fda89293df2dd46542007fd86f724b01ee3c
parentigb: Fix for improper exit in igb_get_i2c_client (diff)
downloadlinux-dev-199f6ccac11e93761ee24e35c621992c078fe76f.tar.xz
linux-dev-199f6ccac11e93761ee24e35c621992c078fe76f.zip
igb: Fix for improper allocation flag in igb_get_i2c_client
This patch fixes the allocation function in igb_get_i2c_client to use GFP_ATOMIC instead of GFP_KERNEL because we have a spinlock. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index d84f28c683c5..c19a35c556f9 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -7751,7 +7751,7 @@ igb_get_i2c_client(struct igb_adapter *adapter, u8 dev_addr)
}
/* no client_list found, create a new one */
- client_list = kzalloc(sizeof(*client_list), GFP_KERNEL);
+ client_list = kzalloc(sizeof(*client_list), GFP_ATOMIC);
if (client_list == NULL)
goto exit;