cdrom: support devices that have check_events but not media_changed
authorSimon Arlott <simon@fire.lp0.eu>
Wed, 9 Feb 2011 13:21:07 +0000 (14:21 +0100)
committerJens Axboe <jaxboe@fusionio.com>
Wed, 9 Feb 2011 13:22:37 +0000 (14:22 +0100)
commitb8cf0e0e552ca48e9a00f518aeb4f5e03984022b
tree83787d1d9b21764cc7685311bcd99ccdb3be2db8
parent02a8f01b5a9f396d0327977af4c232d0f94c45fd
cdrom: support devices that have check_events but not media_changed

Commit 93aae17af1172c40c6f74b7294e93a90c3cfaa5d ("sr: implement
sr_check_events()") replaced the media_changed op with the
check_events op in drivers/scsi/sr.c

All users that check for the CDC_MEDIA_CHANGED capbility try both
the check_events op and the media_changed op, but register_cdrom()
was requiring media_changed.

This patch fixes the capability checking.

The cdrom_select_disc ioctl is also using the two operations, so
they should be required for CDC_SELECT_DISC too.

Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
Cc: Tejun Heo <tj@kernel.org>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Tested-by: Chris Clayton <chris2553@googlemail.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
drivers/cdrom/cdrom.c