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/pktcdvd.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/pktcdvd.c')
| -rw-r--r-- | drivers/block/pktcdvd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index e0588c6..9f2d348 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -2376,10 +2376,9 @@ out: return ret; } -static int pkt_close(struct gendisk *disk, fmode_t mode) +static void pkt_close(struct gendisk *disk, fmode_t mode) { struct pktcdvd_device *pd = disk->private_data; - int ret = 0; mutex_lock(&pktcdvd_mutex); mutex_lock(&ctl_mutex); @@ -2391,7 +2390,6 @@ static int pkt_close(struct gendisk *disk, fmode_t mode) } mutex_unlock(&ctl_mutex); mutex_unlock(&pktcdvd_mutex); - return ret; } |