From d5d1b2dd865f411730d3ad0e1dde0306ea33a2cc Mon Sep 17 00:00:00 2001 From: Douglas Gilbert Date: Sat, 19 Aug 2006 00:11:34 -0400 Subject: [PATCH] --- yaml --- r: 33591 b: refs/heads/master c: b2155d0417df9f2b4c0d396b6530b864d9f08623 h: refs/heads/master i: 33589: bc8bea613178dad31827f46b6475e9c94cef4b29 33587: 01b51d90821fc5197caa6495c1cdd091819ad1c5 33583: f9b8cd58d5cfc3749d6ba1f771b18648383f3672 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sg.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9220a95b2be3..f5d81ec02ee2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48e2691f9c3bd6719e773f0b883449f4cef39585 +refs/heads/master: b2155d0417df9f2b4c0d396b6530b864d9f08623 diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c index 65eef33846bb..34f9343ed0af 100644 --- a/trunk/drivers/scsi/sg.c +++ b/trunk/drivers/scsi/sg.c @@ -18,8 +18,8 @@ * */ -static int sg_version_num = 30533; /* 2 digits for each component */ -#define SG_VERSION_STR "3.5.33" +static int sg_version_num = 30534; /* 2 digits for each component */ +#define SG_VERSION_STR "3.5.34" /* * D. P. Gilbert (dgilbert@interlog.com, dougg@triode.net.au), notes: @@ -60,7 +60,7 @@ static int sg_version_num = 30533; /* 2 digits for each component */ #ifdef CONFIG_SCSI_PROC_FS #include -static char *sg_version_date = "20050908"; +static char *sg_version_date = "20060818"; static int sg_proc_init(void); static void sg_proc_cleanup(void); @@ -1164,7 +1164,7 @@ sg_vma_nopage(struct vm_area_struct *vma, unsigned long addr, int *type) len = vma->vm_end - sa; len = (len < sg->length) ? len : sg->length; if (offset < len) { - page = sg->page; + page = virt_to_page(page_address(sg->page) + offset); get_page(page); /* increment page count */ break; }