From: Bill Pemberton <[email protected]>

Signed-off-by: Bill Pemberton <[email protected]>
Cc: Hank Janssen <[email protected]>
Cc: Haiyang Zhang <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 drivers/staging/hv/blkvsc_drv.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 8f8637e..b6a2cb8 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -1213,7 +1213,10 @@ static int blkvsc_cancel_pending_reqs(struct 
block_device_context *blkdev)
                                        (!comp_req->request.Status ? 0 : -EIO),
                                        comp_req->sector_count *
                                        blkdev->sector_size);
-                               ASSERT(ret != 0);
+
+                               /* FIXME: shouldn't this do more than return? */
+                               if (ret)
+                                       goto out;
                        }
 
                        kmem_cache_free(blkdev->request_pool, comp_req);
@@ -1245,6 +1248,7 @@ static int blkvsc_cancel_pending_reqs(struct 
block_device_context *blkdev)
                kmem_cache_free(blkdev->request_pool, pend_req);
        }
 
+out:
        return ret;
 }
 
-- 
1.7.0.3

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to