1 files changed, 3 insertions, 3 deletions

diff --git a/sound/usb/card.c b/sound/usb/card.c
index d8f2bf401458..05c1aae0b010 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -65,9 +65,9 @@
 #include "helper.h"
 #include "debug.h"
 #include "pcm.h"
-#include "urb.h"
 #include "format.h"
 #include "power.h"
+#include "stream.h"
 
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("USB Audio");
@@ -185,7 +185,7 @@ static int snd_usb_create_stream(struct snd_usb_audio *chip, int ctrlif, int int
                 return -EINVAL;
         }
 
-        if (! snd_usb_parse_audio_endpoints(chip, interface)) {
+        if (! snd_usb_parse_audio_interface(chip, interface)) {
                 usb_set_interface(dev, interface, 0); /* reset the current interface */
                 usb_driver_claim_interface(&usb_audio_driver, iface, (void *)-1L);
                 return -EINVAL;
@@ -631,7 +631,7 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
         if (chip == (void *)-1L)
                 return 0;
 
-        if (!(message.event & PM_EVENT_AUTO)) {
+        if (!PMSG_IS_AUTO(message)) {
                 snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot);
                 if (!chip->num_suspended_intf++) {
                         list_for_each(p, &chip->pcm_list) {