diff --git a/[refs] b/[refs] index dc3cb1c70fa3..7e9e338dadae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6c17484eb386014ee52d9edc8b3e8263d57c640 +refs/heads/master: 582f445fde4886959deacf93b6dea6817f41ba88 diff --git a/trunk/drivers/staging/hv/hyperv_storage.h b/trunk/drivers/staging/hv/hyperv_storage.h index d93bf93eb243..1a59ca090fca 100644 --- a/trunk/drivers/staging/hv/hyperv_storage.h +++ b/trunk/drivers/staging/hv/hyperv_storage.h @@ -294,7 +294,8 @@ static inline struct storvsc_device *get_out_stor_device( struct storvsc_device *stor_device; stor_device = (struct storvsc_device *)device->ext; - if (stor_device && atomic_read(&stor_device->ref_count) > 1) + if (stor_device && (atomic_read(&stor_device->ref_count) > 1) && + !stor_device->destroy) atomic_inc(&stor_device->ref_count); else stor_device = NULL;