From: Andrew Morton <akpm@linux-foundation.org>

Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/ide/ide-cd.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff -puN drivers/ide/ide-cd.c~git-block-git-rejects drivers/ide/ide-cd.c
--- a/drivers/ide/ide-cd.c~git-block-git-rejects
+++ a/drivers/ide/ide-cd.c
@@ -1940,9 +1940,8 @@ static void ide_cd_release(struct kref *
 	struct gendisk *g = info->disk;
 
 	kfree(info->toc);
-	if (devinfo->handle == drive && unregister_cdrom(devinfo))
-		printk(KERN_ERR "%s: %s failed to unregister device from the"
-				" cdrom driver.\n", drive->name, __func__);
+	if (devinfo->handle == drive)
+		unregister_cdrom(devinfo);
 	drive->dsc_overlap = 0;
 	drive->driver_data = NULL;
 	blk_queue_prep_rq(drive->queue, NULL);
_