diff --git a/[refs] b/[refs] index 8ebd4ced3bcf..de82fd839a72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 032c09d76cdb448484859cc84dac4bba8f5f8f14 +refs/heads/master: 4d5cda069b3f0a3bbc18576bc15903ed665d0295 diff --git a/trunk/drivers/scsi/sg.c b/trunk/drivers/scsi/sg.c index 6de7ff9faf2d..b55c2a8a547c 100644 --- a/trunk/drivers/scsi/sg.c +++ b/trunk/drivers/scsi/sg.c @@ -1860,9 +1860,11 @@ st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages, unlock_page(pages[j]); */ res = 0; out_unmap: - if (res > 0) + if (res > 0) { for (j=0; j < res; j++) page_cache_release(pages[j]); + res = 0; + } kfree(pages); return res; }