diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-10-13 11:55:48 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-12 11:39:29 +0100 |
| commit | 574bac4f402239d8dc5cb15952a93eba0602c646 (patch) | |
| tree | 976605eaabdfe9378b7a4aa8ee9ac1db129617ca /sound | |
| parent | d61a969f0e941de5ec682d6236cc9d5fa54bf85b (diff) | |
| download | linux-stable-574bac4f402239d8dc5cb15952a93eba0602c646.tar.gz linux-stable-574bac4f402239d8dc5cb15952a93eba0602c646.tar.bz2 linux-stable-574bac4f402239d8dc5cb15952a93eba0602c646.zip | |
ASoC: Intel: Skylake: Fix a shift wrapping bug
commit c8eabf821cac120afb78ca251b07cbf520406a7e upstream.
"*val" is a u64. It definitely looks like we intend to use the high 32
bits as well.
Fixes: 700a9a63f9c1 ("ASoC: Intel: Skylake: Add module instance id generation APIs")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Tested-by: Kranthi G <gudishax.kranthikumar@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/skylake/skl-sst-utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl-sst-utils.c b/sound/soc/intel/skylake/skl-sst-utils.c index 8dc03039b311..ea162fbf68e5 100644 --- a/sound/soc/intel/skylake/skl-sst-utils.c +++ b/sound/soc/intel/skylake/skl-sst-utils.c @@ -179,7 +179,7 @@ static inline int skl_getid_32(struct uuid_module *module, u64 *val, index = ffz(mask_val); pvt_id = index + word1_mask + word2_mask; if (pvt_id <= (max_inst - 1)) { - *val |= 1 << (index + word1_mask); + *val |= 1ULL << (index + word1_mask); return pvt_id; } } |