diff options
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r-- | drivers/ide/ide-cd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 0c73fe39a236..a2e29099ee0c 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -1177,7 +1177,7 @@ static struct cdrom_device_ops ide_cdrom_dops = { | |||
1177 | .open = ide_cdrom_open_real, | 1177 | .open = ide_cdrom_open_real, |
1178 | .release = ide_cdrom_release_real, | 1178 | .release = ide_cdrom_release_real, |
1179 | .drive_status = ide_cdrom_drive_status, | 1179 | .drive_status = ide_cdrom_drive_status, |
1180 | .media_changed = ide_cdrom_check_media_change_real, | 1180 | .check_events = ide_cdrom_check_events_real, |
1181 | .tray_move = ide_cdrom_tray_move, | 1181 | .tray_move = ide_cdrom_tray_move, |
1182 | .lock_door = ide_cdrom_lock_door, | 1182 | .lock_door = ide_cdrom_lock_door, |
1183 | .select_speed = ide_cdrom_select_speed, | 1183 | .select_speed = ide_cdrom_select_speed, |
@@ -1702,10 +1702,11 @@ static int idecd_ioctl(struct block_device *bdev, fmode_t mode, | |||
1702 | } | 1702 | } |
1703 | 1703 | ||
1704 | 1704 | ||
1705 | static int idecd_media_changed(struct gendisk *disk) | 1705 | static unsigned int idecd_check_events(struct gendisk *disk, |
1706 | unsigned int clearing) | ||
1706 | { | 1707 | { |
1707 | struct cdrom_info *info = ide_drv_g(disk, cdrom_info); | 1708 | struct cdrom_info *info = ide_drv_g(disk, cdrom_info); |
1708 | return cdrom_media_changed(&info->devinfo); | 1709 | return cdrom_check_events(&info->devinfo, clearing); |
1709 | } | 1710 | } |
1710 | 1711 | ||
1711 | static int idecd_revalidate_disk(struct gendisk *disk) | 1712 | static int idecd_revalidate_disk(struct gendisk *disk) |
@@ -1723,7 +1724,7 @@ static const struct block_device_operations idecd_ops = { | |||
1723 | .open = idecd_open, | 1724 | .open = idecd_open, |
1724 | .release = idecd_release, | 1725 | .release = idecd_release, |
1725 | .ioctl = idecd_ioctl, | 1726 | .ioctl = idecd_ioctl, |
1726 | .media_changed = idecd_media_changed, | 1727 | .check_events = idecd_check_events, |
1727 | .revalidate_disk = idecd_revalidate_disk | 1728 | .revalidate_disk = idecd_revalidate_disk |
1728 | }; | 1729 | }; |
1729 | 1730 | ||
@@ -1790,6 +1791,7 @@ static int ide_cd_probe(ide_drive_t *drive) | |||
1790 | ide_cd_read_toc(drive, &sense); | 1791 | ide_cd_read_toc(drive, &sense); |
1791 | g->fops = &idecd_ops; | 1792 | g->fops = &idecd_ops; |
1792 | g->flags |= GENHD_FL_REMOVABLE; | 1793 | g->flags |= GENHD_FL_REMOVABLE; |
1794 | g->events = DISK_EVENT_MEDIA_CHANGE; | ||
1793 | add_disk(g); | 1795 | add_disk(g); |
1794 | return 0; | 1796 | return 0; |
1795 | 1797 | ||