---

yaml --- r: 136252 b: refs/heads/master c: 78a42ce h: refs/heads/master v: v3
git-mirror · Mar 12, 2009 · 174a745 · 174a745
1 parent e1c3f33
commit 174a745
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68274794c69991121eaf0a4a35b78aa7f088ec2c
+refs/heads/master: 78a42ce8fb2604c459e9ebb2a4f2d546b8250111
diff --git a/trunk/drivers/scsi/osst.c b/trunk/drivers/scsi/osst.c
@@ -5286,11 +5286,6 @@ static int enlarge_buffer(struct osst_buffer *STbuffer, int need_dma)
 		struct page *page = alloc_pages(priority, (OS_FRAME_SIZE - got <= PAGE_SIZE) ? 0 : order);
 		STbuffer->sg[segs].offset = 0;
 		if (page == NULL) {
-			if (OS_FRAME_SIZE - got <= (max_segs - segs) * b_size / 2 && order) {
-				b_size /= 2;  /* Large enough for the rest of the buffers */
-				order--;
-				continue;
-			}
 			printk(KERN_WARNING "osst :W: Failed to enlarge buffer to %d bytes.\n",
 						OS_FRAME_SIZE);
 #if DEBUG