From 46e3c46551c6b8e56f1b5f38c9463ad20d85a68b Mon Sep 17 00:00:00 2001
From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sun, 4 Mar 2012 14:23:00 +0100
Subject: [PATCH] --- yaml --- r: 294122 b: refs/heads/master c:
 c13ccfcf66b2e70f8d01f7fe7e1e20ba60e733e1 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/firewire/sbp2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 520a30217ccb..88c53f46cbde 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6503de65459da619d3ade0824c9cc17ea0a57141
+refs/heads/master: c13ccfcf66b2e70f8d01f7fe7e1e20ba60e733e1
diff --git a/trunk/drivers/firewire/sbp2.c b/trunk/drivers/firewire/sbp2.c
index cc5828e7c735..1bd78d8f182e 100644
--- a/trunk/drivers/firewire/sbp2.c
+++ b/trunk/drivers/firewire/sbp2.c
@@ -569,7 +569,7 @@ static int sbp2_send_management_orb(struct sbp2_logical_unit *lu, int node_id,
 	if (function == SBP2_LOGOUT_REQUEST && fw_device_is_shutdown(device))
 		return 0;
 
-	orb = kzalloc(sizeof(*orb), GFP_ATOMIC);
+	orb = kzalloc(sizeof(*orb), GFP_NOIO);
 	if (orb == NULL)
 		return -ENOMEM;