diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-08-12 09:55:01 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-08-12 09:55:10 +0300 |
| commit | 73b383141d296c55bfbc0ce336a4a946627e7780 (patch) | |
| tree | df0840c4ea4bbd5aa453931a594936bd9adab61d /sound/pci/trident/trident_main.c | |
| parent | 627661ced8246c8e833f3bc3817070e934cd79ba (diff) | |
| parent | 91c6e15efc1756b068dc6e945c1626397e60a119 (diff) | |
| download | linux-73b383141d296c55bfbc0ce336a4a946627e7780.tar.xz | |
Merge branch 'for-next' into for-linus
Preparation for 4.19 merge material.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/trident/trident_main.c')
| -rw-r--r-- | sound/pci/trident/trident_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c index 49c64fae3466..5523e193d556 100644 --- a/sound/pci/trident/trident_main.c +++ b/sound/pci/trident/trident_main.c @@ -3359,7 +3359,7 @@ static int snd_trident_tlb_alloc(struct snd_trident *trident) dev_err(trident->card->dev, "unable to allocate TLB buffer\n"); return -ENOMEM; } - trident->tlb.entries = (unsigned int*)ALIGN((unsigned long)trident->tlb.buffer.area, SNDRV_TRIDENT_MAX_PAGES * 4); + trident->tlb.entries = (__le32 *)ALIGN((unsigned long)trident->tlb.buffer.area, SNDRV_TRIDENT_MAX_PAGES * 4); trident->tlb.entries_dmaaddr = ALIGN(trident->tlb.buffer.addr, SNDRV_TRIDENT_MAX_PAGES * 4); /* allocate shadow TLB page table (virtual addresses) */ trident->tlb.shadow_entries = |