diff --git a/[refs] b/[refs]
index eca0a24a6e92..6498c61e4072 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 373daacfce9ea0091cb3027572354ddebefb8ebb
+refs/heads/master: 46081b166415acb66d4b3150ecefcd9460bb48a1
diff --git a/trunk/drivers/scsi/st.c b/trunk/drivers/scsi/st.c
index 12a36acae0b0..1871b8ae83ae 100644
--- a/trunk/drivers/scsi/st.c
+++ b/trunk/drivers/scsi/st.c
@@ -3729,7 +3729,8 @@ static int enlarge_buffer(struct st_buffer * STbuffer, int new_size, int need_dm
 		b_size = PAGE_SIZE << order;
 	} else {
 		for (b_size = PAGE_SIZE, order = 0;
-		     order < ST_MAX_ORDER && b_size < new_size;
+		     order < ST_MAX_ORDER &&
+			     max_segs * (PAGE_SIZE << order) < new_size;
 		     order++, b_size *= 2)
 			;  /* empty */
 		STbuffer->reserved_page_order = order;