From f77ce37e3f78c85af3faa21bc38e33ce718bf5d8 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@elliptictech.com>
Date: Mon, 17 Dec 2012 16:05:20 -0800
Subject: [PATCH] --- yaml --- r: 346519 b: refs/heads/master c:
 6fd59a83b9261fa53eaf98fb5514abba504a3ea3 h: refs/heads/master i:   346517:
 6e4384556a27e58a3814d7ffa0626d8d1fdbcfde   346515:
 85dacd2e0cf17ff73c4b1fa8c4ee52c2c3f17749   346511:
 45322fa24eb3bdd903d012785cfadfb6dcbeb54c v: v3

---
 [refs]                  | 2 +-
 trunk/lib/scatterlist.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 496265c9b94e..43cdb2b62b22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e71ec593201e1b367b5f22955e3db49e3c562e67
+refs/heads/master: 6fd59a83b9261fa53eaf98fb5514abba504a3ea3
diff --git a/trunk/lib/scatterlist.c b/trunk/lib/scatterlist.c
index 3675452b23ca..7874b01e816e 100644
--- a/trunk/lib/scatterlist.c
+++ b/trunk/lib/scatterlist.c
@@ -248,7 +248,8 @@ int __sg_alloc_table(struct sg_table *table, unsigned int nents,
 	unsigned int left;
 
 #ifndef ARCH_HAS_SG_CHAIN
-	BUG_ON(nents > max_ents);
+	if (WARN_ON_ONCE(nents > max_ents))
+		return -EINVAL;
 #endif
 
 	memset(table, 0, sizeof(*table));