diff --git a/[refs] b/[refs] index 1d27efa2cfc8..58a36d1c38d2 100644 --- 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 index 8f21cbbd7aaf..13f908cb0674 100644 --- 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