diff options
| author | Mark Brown <broonie@kernel.org> | 2019-03-18 11:15:09 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-03-18 11:15:09 +0000 |
| commit | 127470597b6b9466872d9794a80804ec95fff8ea (patch) | |
| tree | b0087938a7f980c5b3d3879e0c2d18bab45d78e8 /sound/core/compress_offload.c | |
| parent | 3789debfc379ac84b90e2db32d7a6b66d28a2c7c (diff) | |
| parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) | |
| download | linux-127470597b6b9466872d9794a80804ec95fff8ea.tar.gz linux-127470597b6b9466872d9794a80804ec95fff8ea.tar.bz2 linux-127470597b6b9466872d9794a80804ec95fff8ea.zip | |
Merge tag 'v5.1-rc1' into asoc-5.2
Linux 5.1-rc1
Diffstat (limited to 'sound/core/compress_offload.c')
| -rw-r--r-- | sound/core/compress_offload.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index f7d2b373da0a..a1a6fd75cfe5 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -1015,22 +1015,13 @@ static int snd_compress_proc_init(struct snd_compr *compr) if (!entry) return -ENOMEM; entry->mode = S_IFDIR | 0555; - if (snd_info_register(entry) < 0) { - snd_info_free_entry(entry); - return -ENOMEM; - } compr->proc_root = entry; entry = snd_info_create_card_entry(compr->card, "info", compr->proc_root); - if (entry) { + if (entry) snd_info_set_text_ops(entry, compr, snd_compress_proc_info_read); - if (snd_info_register(entry) < 0) { - snd_info_free_entry(entry); - entry = NULL; - } - } compr->proc_info_entry = entry; return 0; |