diff options
author | Dave Airlie <airlied@redhat.com> | 2011-10-18 10:54:30 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2011-10-18 10:54:30 +0100 |
commit | 017ed8012e74ca15748863f45d2c078453026a0a (patch) | |
tree | 7071171a06de4e93fc890e0afce5c23596a26619 /sound/usb/card.c | |
parent | 80d9b24a658c83602aea66e45e2347c5bb3cbd47 (diff) | |
parent | 899e3ee404961a90b828ad527573aaaac39f0ab1 (diff) |
Merge tag 'v3.1-rc10' into drm-core-nextdrm-core-next-testing
There are a number of fixes in mainline required for code in -next,
also there was a few conflicts I'd rather resolve myself.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_asic.h
Diffstat (limited to 'sound/usb/card.c')
-rw-r--r-- | sound/usb/card.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 781d9e61adfb..d8f2bf401458 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -530,8 +530,11 @@ snd_usb_audio_probe(struct usb_device *dev, return chip; __error: - if (chip && !chip->num_interfaces) - snd_card_free(chip->card); + if (chip) { + if (!chip->num_interfaces) + snd_card_free(chip->card); + chip->probing = 0; + } mutex_unlock(®ister_mutex); __err_val: return NULL; |