From 99fc87b4bc42bb20dd5da3b9076ef296a48180fc Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Mon, 18 Aug 2008 21:40:03 +0200 Subject: [PATCH] --- yaml --- r: 108743 b: refs/heads/master c: 3e636f78e5bbe95831e4d0071ee8f40b507e1cbd h: refs/heads/master i: 108741: 8b131f69cc88389e7755c08f542db807a53bcc66 108739: 918c9ee0e0554e6c0211807c72da0d05953490c7 108735: 11399d1f8ab0fd626b350f266ee23592bf5a8ebe v: v3 --- [refs] | 2 +- trunk/drivers/cdrom/viocd.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 28d2df411e5b..d955239630f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f49060adcc1817337af95392bdf8a6205abffa0 +refs/heads/master: 3e636f78e5bbe95831e4d0071ee8f40b507e1cbd diff --git a/trunk/drivers/cdrom/viocd.c b/trunk/drivers/cdrom/viocd.c index 9d0dfe6e0d63..031e0e1a1a3b 100644 --- a/trunk/drivers/cdrom/viocd.c +++ b/trunk/drivers/cdrom/viocd.c @@ -550,12 +550,19 @@ static void vio_handle_cd_event(struct HvLpEvent *event) } } +static int viocd_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd, + void *arg) +{ + return -EINVAL; +} + static struct cdrom_device_ops viocd_dops = { .open = viocd_open, .release = viocd_release, .media_changed = viocd_media_changed, .lock_door = viocd_lock_door, .generic_packet = viocd_packet, + .audio_ioctl = viocd_audio_ioctl, .capability = CDC_CLOSE_TRAY | CDC_OPEN_TRAY | CDC_LOCK | CDC_SELECT_SPEED | CDC_SELECT_DISC | CDC_MULTI_SESSION | CDC_MCN | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO | CDC_RESET | CDC_DRIVE_STATUS | CDC_GENERIC_PACKET | CDC_CD_R | CDC_CD_RW | CDC_DVD | CDC_DVD_R | CDC_DVD_RAM | CDC_RAM };