aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/memstick')
-rw-r--r--drivers/memstick/core/mspro_block.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index f12b78dbce04..f4176ca3a794 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -204,7 +204,7 @@ static int mspro_block_bd_open(struct block_device *bdev, fmode_t mode)
204} 204}
205 205
206 206
207static int mspro_block_disk_release(struct gendisk *disk) 207static void mspro_block_disk_release(struct gendisk *disk)
208{ 208{
209 struct mspro_block_data *msb = disk->private_data; 209 struct mspro_block_data *msb = disk->private_data;
210 int disk_id = MINOR(disk_devt(disk)) >> MSPRO_BLOCK_PART_SHIFT; 210 int disk_id = MINOR(disk_devt(disk)) >> MSPRO_BLOCK_PART_SHIFT;
@@ -224,13 +224,11 @@ static int mspro_block_disk_release(struct gendisk *disk)
224 } 224 }
225 225
226 mutex_unlock(&mspro_block_disk_lock); 226 mutex_unlock(&mspro_block_disk_lock);
227
228 return 0;
229} 227}
230 228
231static int mspro_block_bd_release(struct gendisk *disk, fmode_t mode) 229static void mspro_block_bd_release(struct gendisk *disk, fmode_t mode)
232{ 230{
233 return mspro_block_disk_release(disk); 231 mspro_block_disk_release(disk);
234} 232}
235 233
236static int mspro_block_bd_getgeo(struct block_device *bdev, 234static int mspro_block_bd_getgeo(struct block_device *bdev,