From e08cb887e7eb04fcb517159ea3fbb6d67566f567 Mon Sep 17 00:00:00 2001 From: Hank Janssen Date: Thu, 5 Aug 2010 19:29:44 +0000 Subject: [PATCH] --- yaml --- r: 210235 b: refs/heads/master c: 0c47a70a9a8a6d1ec37a53d2f9cb82f8b8ef8aa2 h: refs/heads/master i: 210233: 4baa969fda632ccb32b98c7525e436921f03aeb7 210231: c71f3f8e8bfa87a904513a7124b956faddda11d1 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/storvsc_drv.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 20f14971fe10..7ce7822d6cd8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b681b5886bb5d1f5b6750a0ed7c62846da7ccea4 +refs/heads/master: 0c47a70a9a8a6d1ec37a53d2f9cb82f8b8ef8aa2 diff --git a/trunk/drivers/staging/hv/storvsc_drv.c b/trunk/drivers/staging/hv/storvsc_drv.c index 075b61bd492f..3b9ccb062008 100644 --- a/trunk/drivers/staging/hv/storvsc_drv.c +++ b/trunk/drivers/staging/hv/storvsc_drv.c @@ -495,7 +495,7 @@ static unsigned int copy_to_bounce_buffer(struct scatterlist *orig_sgl, /* ASSERT(orig_sgl[i].offset + orig_sgl[i].length <= PAGE_SIZE); */ - if (j == 0) + if (bounce_addr == 0) bounce_addr = (unsigned long)kmap_atomic(sg_page((&bounce_sgl[j])), KM_IRQ0); while (srclen) { @@ -556,7 +556,7 @@ static unsigned int copy_from_bounce_buffer(struct scatterlist *orig_sgl, destlen = orig_sgl[i].length; /* ASSERT(orig_sgl[i].offset + orig_sgl[i].length <= PAGE_SIZE); */ - if (j == 0) + if (bounce_addr == 0) bounce_addr = (unsigned long)kmap_atomic(sg_page((&bounce_sgl[j])), KM_IRQ0); while (destlen) {