diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-09 08:54:50 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-09 08:54:50 +0100 |
| commit | d1612c80edaab7ac9170cb2fc86b538ab2e5a741 (patch) | |
| tree | 759755d5abef02f23a42f5056aaac84de694d5ad /sound/soc/intel/sst/sst.h | |
| parent | d34890cf4113397625a6629d71749fa638a7a734 (diff) | |
| parent | f4c2e9bcb0be4ee1c8722853e4faaaf6a9423d72 (diff) | |
| download | lwn-d1612c80edaab7ac9170cb2fc86b538ab2e5a741.tar.gz lwn-d1612c80edaab7ac9170cb2fc86b538ab2e5a741.zip | |
Merge tag 'asoc-v3.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Final updates for v3.20
A few more updates for v3.20 that have accumilated over the second half
of last week. One new (relatively simple) driver for the Maxim
max98357a and some other driver specific fixes and enhancements. I did
apply a few patches that haven't been in -next just now before sending
this, all fixes except for one simple device ID addition patch.
Diffstat (limited to 'sound/soc/intel/sst/sst.h')
| -rw-r--r-- | sound/soc/intel/sst/sst.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/intel/sst/sst.h b/sound/soc/intel/sst/sst.h index 7f4bbfcbc6f5..562bc483d6b7 100644 --- a/sound/soc/intel/sst/sst.h +++ b/sound/soc/intel/sst/sst.h @@ -58,6 +58,7 @@ enum sst_algo_ops { #define SST_BLOCK_TIMEOUT 1000 #define FW_SIGNATURE_SIZE 4 +#define FW_NAME_SIZE 32 /* stream states */ enum sst_stream_states { @@ -426,7 +427,7 @@ struct intel_sst_drv { * Holder for firmware name. Due to async call it needs to be * persistent till worker thread gets called */ - char firmware_name[20]; + char firmware_name[FW_NAME_SIZE]; }; /* misc definitions */ |