diff options
| author | Steve Pfetsch <spfetsch@google.com> | 2016-05-03 12:49:49 -0700 |
|---|---|---|
| committer | Steve Pfetsch <spfetsch@google.com> | 2016-05-03 12:49:49 -0700 |
| commit | 42408dde031eb14e0ebfa2a27993f01422f7de53 (patch) | |
| tree | 99fa5fe0fee21d0edfbe44c9d31686e46299fb38 /sound/usb | |
| parent | 703c92069d9571adfc77eb3646654d3333d2c434 (diff) | |
| parent | 452dd7ba0b1179321d1bea5b5a800d956378c05b (diff) | |
Merge AU_LINUX_ANDROID_LA.HB.1.3.9.06.00.01.213.156 into android-msm-marlin-3.18
Conflicts:
arch/arm/mm/mmap.c
drivers/gpu/msm/adreno_a5xx.c
drivers/video/msm/mdss/msm_mdss_io_8974.c
kernel/trace/trace_event_perf.c
sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
Change-Id: I66e83a530e2314ab43fc5a4ed205662853418f98
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 9ca09d2b6c71..339ce6bc8e75 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -675,7 +675,7 @@ int snd_usb_autoresume(struct snd_usb_audio *chip) int err = -ENODEV; down_read(&chip->shutdown_rwsem); - if (chip->probing && chip->in_pm) + if (chip->probing || chip->in_pm) err = 0; else if (!chip->shutdown) err = usb_autopm_get_interface(chip->pm_intf); |