aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/storvsc_drv.c
diff options
context:
space:
mode:
authorGary S. Robertson <gary.robertson@linaro.org>2014-03-31 11:45:11 -0500
committerGary S. Robertson <gary.robertson@linaro.org>2014-03-31 11:45:11 -0500
commite365c882ed38dbbe1a6ff4ed72414835390368a6 (patch)
tree82eb481631cd22d3767f638cd4d0a3b2598ab61e /drivers/scsi/storvsc_drv.c
parent9ce234e1ee801968b204c3b9caa75ce0a76ed1c2 (diff)
parent10f8245e0d3650144b034142c8f91e5d15c392ab (diff)
Merge tag 'v3.10.34' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.34-finallinux-lng-3.10.34-2014.04
This is the 3.10.34 stable release
Diffstat (limited to 'drivers/scsi/storvsc_drv.c')
-rw-r--r--drivers/scsi/storvsc_drv.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index fb7437dd5b7a..91b76cea3e3c 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1189,6 +1189,9 @@ static void storvsc_device_destroy(struct scsi_device *sdevice)
{
struct stor_mem_pools *memp = sdevice->hostdata;
+ if (!memp)
+ return;
+
mempool_destroy(memp->request_mempool);
kmem_cache_destroy(memp->request_pool);
kfree(memp);