1 files changed, 8 insertions, 8 deletions

diff --git a/sound/usb/card.c b/sound/usb/card.c
index 220c6167dd8..781d9e61adf 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -433,9 +433,10 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx,
  * only at the first time.  the successive calls of this function will
  * append the pcm interface to the corresponding card.
  */
-static void *snd_usb_audio_probe(struct usb_device *dev,
-                                 struct usb_interface *intf,
-                                 const struct usb_device_id *usb_id)
+static struct snd_usb_audio *
+snd_usb_audio_probe(struct usb_device *dev,
+                    struct usb_interface *intf,
+                    const struct usb_device_id *usb_id)
 {
         const struct snd_usb_audio_quirk *quirk = (const struct snd_usb_audio_quirk *)usb_id->driver_info;
         int i, err;
@@ -540,16 +541,15 @@ static void *snd_usb_audio_probe(struct usb_device *dev,
  * we need to take care of counter, since disconnection can be called also
  * many times as well as usb_audio_probe().
  */
-static void snd_usb_audio_disconnect(struct usb_device *dev, void *ptr)
+static void snd_usb_audio_disconnect(struct usb_device *dev,
+                                     struct snd_usb_audio *chip)
 {
-        struct snd_usb_audio *chip;
         struct snd_card *card;
         struct list_head *p;
 
-        if (ptr == (void *)-1L)
+        if (chip == (void *)-1L)
                 return;
 
-        chip = ptr;
         card = chip->card;
         mutex_lock(&register_mutex);
         mutex_lock(&chip->shutdown_mutex);
@@ -585,7 +585,7 @@ static void snd_usb_audio_disconnect(struct usb_device *dev, void *ptr)
 static int usb_audio_probe(struct usb_interface *intf,
                            const struct usb_device_id *id)
 {
-        void *chip;
+        struct snd_usb_audio *chip;
         chip = snd_usb_audio_probe(interface_to_usbdev(intf), intf, id);
         if (chip) {
                 usb_set_intfdata(intf, chip);