From 00bded06c4444be5f36a1dcc51faf6484903952c Mon Sep 17 00:00:00 2001 From: Kai Makisara Date: Mon, 20 Dec 2010 18:43:39 +0200 Subject: [PATCH] --- yaml --- r: 226860 b: refs/heads/master c: 373daacfce9ea0091cb3027572354ddebefb8ebb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/st.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4a6b7b11ffeb..eca0a24a6e92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a87e3a67d57472f40da2218793ff6d25c4518498 +refs/heads/master: 373daacfce9ea0091cb3027572354ddebefb8ebb diff --git a/trunk/drivers/scsi/st.c b/trunk/drivers/scsi/st.c index 5b7388f1c835..12a36acae0b0 100644 --- a/trunk/drivers/scsi/st.c +++ b/trunk/drivers/scsi/st.c @@ -17,7 +17,7 @@ Last modified: 18-JAN-1998 Richard Gooch Devfs support */ -static const char *verstr = "20100829"; +static const char *verstr = "20101219"; #include @@ -3732,6 +3732,7 @@ static int enlarge_buffer(struct st_buffer * STbuffer, int new_size, int need_dm order < ST_MAX_ORDER && b_size < new_size; order++, b_size *= 2) ; /* empty */ + STbuffer->reserved_page_order = order; } if (max_segs * (PAGE_SIZE << order) < new_size) { if (order == ST_MAX_ORDER) @@ -3758,7 +3759,6 @@ static int enlarge_buffer(struct st_buffer * STbuffer, int new_size, int need_dm segs++; } STbuffer->b_data = page_address(STbuffer->reserved_pages[0]); - STbuffer->reserved_page_order = order; return 1; }