diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 16:26:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-02-15 16:26:41 +0900 |
| commit | d60cf53a30956e47919788b2ef49287786a959c9 (patch) | |
| tree | cb518d7cc4813f4b54a3fd5fcaad43e6d82be6a3 /drivers/cdrom/cdrom.c | |
| parent | 0ce08870b8a4895044b6cf2bbdc774a6faaa3656 (diff) | |
| parent | 13c12a4e8ecdf3998cd2d89ade69f6f194819c95 (diff) | |
| download | talos-op-linux-d60cf53a30956e47919788b2ef49287786a959c9.tar.gz talos-op-linux-d60cf53a30956e47919788b2ef49287786a959c9.zip | |
Merge branch 'sh/st-integration' into sh/urgent
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); |
