aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/memstick/core/mspro_block.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index a167938d4517..b11b2b89ae22 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -23,7 +23,6 @@
23 23
24#define DRIVER_NAME "mspro_block" 24#define DRIVER_NAME "mspro_block"
25 25
26static DEFINE_MUTEX(mspro_block_mutex);
27static int major; 26static int major;
28module_param(major, int, 0644); 27module_param(major, int, 0644);
29 28
@@ -181,7 +180,6 @@ static int mspro_block_bd_open(struct block_device *bdev, fmode_t mode)
181 struct mspro_block_data *msb = disk->private_data; 180 struct mspro_block_data *msb = disk->private_data;
182 int rc = -ENXIO; 181 int rc = -ENXIO;
183 182
184 mutex_lock(&mspro_block_mutex);
185 mutex_lock(&mspro_block_disk_lock); 183 mutex_lock(&mspro_block_disk_lock);
186 184
187 if (msb && msb->card) { 185 if (msb && msb->card) {
@@ -193,7 +191,6 @@ static int mspro_block_bd_open(struct block_device *bdev, fmode_t mode)
193 } 191 }
194 192
195 mutex_unlock(&mspro_block_disk_lock); 193 mutex_unlock(&mspro_block_disk_lock);
196 mutex_unlock(&mspro_block_mutex);
197 194
198 return rc; 195 return rc;
199} 196}
@@ -225,11 +222,7 @@ static int mspro_block_disk_release(struct gendisk *disk)
225 222
226static int mspro_block_bd_release(struct gendisk *disk, fmode_t mode) 223static int mspro_block_bd_release(struct gendisk *disk, fmode_t mode)
227{ 224{
228 int ret; 225 return mspro_block_disk_release(disk);
229 mutex_lock(&mspro_block_mutex);
230 ret = mspro_block_disk_release(disk);
231 mutex_unlock(&mspro_block_mutex);
232 return ret;
233} 226}
234 227
235static int mspro_block_bd_getgeo(struct block_device *bdev, 228static int mspro_block_bd_getgeo(struct block_device *bdev,