From ef9fc7e35aca8854af9c951fd37e9b23db04038c Mon Sep 17 00:00:00 2001
From: Carolyn Wyborny <carolyn.wyborny@intel.com>
Date: Wed, 23 Jan 2013 03:43:01 +0000
Subject: [PATCH] --- yaml --- r: 352481 b: refs/heads/master c:
 199f6ccac11e93761ee24e35c621992c078fe76f h: refs/heads/master i:   352479:
 1d77c0d87d3edfe039b13d3373e03b399ee5ec24 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 046ad909e47a..1a796eacd9d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3f8ef1169afb08976b4b1dafe7bc740f655d886
+refs/heads/master: 199f6ccac11e93761ee24e35c621992c078fe76f
diff --git a/trunk/drivers/net/ethernet/intel/igb/igb_main.c b/trunk/drivers/net/ethernet/intel/igb/igb_main.c
index d84f28c683c5..c19a35c556f9 100644
--- a/trunk/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/trunk/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;