2 files changed, 5 insertions, 5 deletions

diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c
index d898f737c07e..48b63ccc78c7 100644
--- a/sound/usb/caiaq/device.c
+++ b/sound/usb/caiaq/device.c
@@ -159,8 +159,8 @@ static struct usb_device_id snd_usb_id_table[] = {
 static void usb_ep1_command_reply_dispatch (struct urb* urb)
 {
         int ret;
+        struct device *dev = &urb->dev->dev;
         struct snd_usb_caiaqdev *cdev = urb->context;
-        struct device *dev = caiaqdev_to_dev(cdev);
         unsigned char *buf = urb->transfer_buffer;
 
         if (urb->status || !cdev) {
@@ -511,13 +511,13 @@ static int snd_probe(struct usb_interface *intf,
 static void snd_disconnect(struct usb_interface *intf)
 {
         struct snd_card *card = usb_get_intfdata(intf);
-        struct snd_usb_caiaqdev *cdev = caiaqdev(card);
-        struct device *dev;
+        struct device *dev = intf->usb_dev;
+        struct snd_usb_caiaqdev *cdev;
 
         if (!card)
                 return;
 
-        dev = caiaqdev_to_dev(cdev);
+        cdev = caiaqdev(card);
         dev_dbg(dev, "%s(%p)\n", __func__, intf);
 
         snd_card_disconnect(card);
diff --git a/sound/usb/caiaq/input.c b/sound/usb/caiaq/input.c
index fe8f4b4fd369..efc70ae915c5 100644
--- a/sound/usb/caiaq/input.c
+++ b/sound/usb/caiaq/input.c
@@ -503,8 +503,8 @@ static void snd_usb_caiaq_maschine_dispatch(struct snd_usb_caiaqdev *cdev,
 static void snd_usb_caiaq_ep4_reply_dispatch(struct urb *urb)
 {
         struct snd_usb_caiaqdev *cdev = urb->context;
-        struct device *dev = caiaqdev_to_dev(cdev);
         unsigned char *buf = urb->transfer_buffer;
+        struct device *dev = &urb->dev->dev;
         int ret;
 
         if (urb->status || !cdev || urb != cdev->ep4_in_urb)