diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-09 11:45:21 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-09 11:45:21 -0800 |
commit | aceb91cd351bc3a19a783c901fe8a8070d5f6fa9 (patch) | |
tree | a0863e940a77ae10d3c8b391488e29a8245b31be /drivers/cdrom/cdrom.c | |
parent | ae8eed2d0906bf0d8eb0c2a4651676a41d361297 (diff) | |
parent | b8cf0e0e552ca48e9a00f518aeb4f5e03984022b (diff) | |
download | linux-stable-aceb91cd351bc3a19a783c901fe8a8070d5f6fa9.tar.gz linux-stable-aceb91cd351bc3a19a783c901fe8a8070d5f6fa9.tar.bz2 linux-stable-aceb91cd351bc3a19a783c901fe8a8070d5f6fa9.zip |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cdrom: support devices that have check_events but not media_changed
cfq-iosched: Don't wait if queue already has requests.
blkio-throttle: Avoid calling blkiocg_lookup_group() for root group
cfq: rename a function to give it more appropriate name
cciss: make cciss_revalidate not loop through CISS_MAX_LUNS volumes unnecessarily.
drivers/block/aoe/Makefile: replace the use of <module>-objs with <module>-y
loop: queue_lock NULL pointer derefence in blk_throtl_exit
drivers/block/Makefile: replace the use of <module>-objs with <module>-y
blktrace: Don't output messages if NOTIFY isn't set.
Diffstat (limited to 'drivers/cdrom/cdrom.c')
-rw-r--r-- | drivers/cdrom/cdrom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index 14033a36bcd0..e2c48a7eccff 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c @@ -409,7 +409,8 @@ int register_cdrom(struct cdrom_device_info *cdi) } ENSURE(drive_status, CDC_DRIVE_STATUS ); - ENSURE(media_changed, CDC_MEDIA_CHANGED); + if (cdo->check_events == NULL && cdo->media_changed == NULL) + *change_capability = ~(CDC_MEDIA_CHANGED | CDC_SELECT_DISC); ENSURE(tray_move, CDC_CLOSE_TRAY | CDC_OPEN_TRAY); ENSURE(lock_door, CDC_LOCK); ENSURE(select_speed, CDC_SELECT_SPEED); |