diff options
| author | Gary Robertson <gary.robertson@linaro.org> | 2013-10-31 17:57:05 -0700 |
|---|---|---|
| committer | Gary Robertson <gary.robertson@linaro.org> | 2013-10-31 17:57:05 -0700 |
| commit | b7fbb07e1d6744e87079a12dc29f7c2fb8205c26 (patch) | |
| tree | e51ff461b46a470c81d62c6d86853187646624c3 /sound/core/compress_offload.c | |
| parent | 4da2c19b694dd0e5932cee3eeb40df3e637628cc (diff) | |
| parent | cac65253a9c5a30d4c8d7bc4c60197935f9e2e70 (diff) | |
Merge tag 'v3.10.15' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.15-final
This is the 3.10.15 stable release
Diffstat (limited to 'sound/core/compress_offload.c')
| -rw-r--r-- | sound/core/compress_offload.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 98969541cbcc..5863ba6dd12b 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -837,7 +837,8 @@ static int snd_compress_dev_disconnect(struct snd_device *device) struct snd_compr *compr; compr = device->device_data; - snd_unregister_device(compr->direction, compr->card, compr->device); + snd_unregister_device(SNDRV_DEVICE_TYPE_COMPRESS, compr->card, + compr->device); return 0; } |