From e843a7c3087a76764204740383031af8f0802c3f Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Fri, 31 Jul 2009 10:54:25 +0000 Subject: [PATCH] Merge of r994: Patch from Smadar Gonen fixing some minor corner cases git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/1.0.1.x@995 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_user.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scst/src/dev_handlers/scst_user.c b/scst/src/dev_handlers/scst_user.c index a2c09f9dc..aa426b430 100644 --- a/scst/src/dev_handlers/scst_user.c +++ b/scst/src/dev_handlers/scst_user.c @@ -2824,7 +2824,7 @@ static int dev_user_unregister_dev(struct file *file) dev = (struct scst_user_dev *)file->private_data; if (dev == NULL) { mutex_unlock(&dev_priv_mutex); - goto out; + goto out_resume; } dev->blocking = 0; @@ -2840,6 +2840,7 @@ static int dev_user_unregister_dev(struct file *file) kfree(dev); +out_resume: scst_resume_activity(); out: @@ -3131,10 +3132,8 @@ static int dev_user_release(struct inode *inode, struct file *file) TRACE_ENTRY(); dev = (struct scst_user_dev *)file->private_data; - if (dev == NULL) { - mutex_unlock(&dev_priv_mutex); + if (dev == NULL) goto out; - } file->private_data = NULL; TRACE_MGMT_DBG("Going to release dev %s", dev->name);