diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 22:14:53 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 22:14:53 (GMT) |
| commit | 292088ee032d0df59e7c8a7a00e9b97260146078 (patch) | |
| tree | 99e5eee404285d4e2b6d282113cccee58236580f /drivers/block/amiflop.c | |
| parent | bc2d968f0ec698c66750e0ad1c1d35568fe93c05 (diff) | |
| parent | 254844d3b9959b52fedf2f22810cc66e82a1ca16 (diff) | |
| download | linux-fsl-qoriq-292088ee032d0df59e7c8a7a00e9b97260146078.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull more vfs updates from Al Viro:
"A couple of fixes + getting rid of __blkdev_put() return value"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
proc: Use PDE attribute setting accessor functions
make blkdev_put() return void
block_device_operations->release() should return void
mtd_blktrans_ops->release() should return void
hfs: SMP race on directory close()
Diffstat (limited to 'drivers/block/amiflop.c')
| -rw-r--r-- | drivers/block/amiflop.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index 386146d..4ff85b8 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c @@ -1634,7 +1634,7 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) return 0; } -static int floppy_release(struct gendisk *disk, fmode_t mode) +static void floppy_release(struct gendisk *disk, fmode_t mode) { struct amiga_floppy_struct *p = disk->private_data; int drive = p - unit; @@ -1654,7 +1654,6 @@ static int floppy_release(struct gendisk *disk, fmode_t mode) floppy_off (drive | 0x40000000); #endif mutex_unlock(&amiflop_mutex); - return 0; } /* |