From 36b0a4bb32bce7dd012495cc9abf4170d67f132c Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 27 Oct 2008 11:32:27 +0900 Subject: [PATCH] --- yaml --- r: 118238 b: refs/heads/master c: 545727f32049f6e7269f73a49904e3229192988e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/cdrom/gdrom.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 35f140ba8bc3..b475927ec850 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e00afb64239dc764193d48a28bbfba6da2b3b5de +refs/heads/master: 545727f32049f6e7269f73a49904e3229192988e diff --git a/trunk/drivers/cdrom/gdrom.c b/trunk/drivers/cdrom/gdrom.c index 9aaa86b232b1..2eecb779437b 100644 --- a/trunk/drivers/cdrom/gdrom.c +++ b/trunk/drivers/cdrom/gdrom.c @@ -495,9 +495,10 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode) return cdrom_open(gd.cd_info, bdev, mode); } -static int gdrom_bdops_release(struct block_device *bdev, fmode_t mode) +static int gdrom_bdops_release(struct gendisk *disk, fmode_t mode) { - return cdrom_release(gd.cd_info, mode); + cdrom_release(gd.cd_info, mode); + return 0; } static int gdrom_bdops_mediachanged(struct gendisk *disk)