diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-11-25 16:27:33 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-11-25 16:27:41 +0300 |
| commit | 09578eacaaa44149738267083ccc050990409f86 (patch) | |
| tree | cf614ee065fe5479e4638abebe12c9e1578b09d9 /drivers/vfio/vfio_iommu_type1.c | |
| parent | c6b6fc206586cc07a18595d2a3d815a806a057d0 (diff) | |
| parent | 8c4d2a0bfbd27d030e4652b714cd5a1598f3559b (diff) | |
| download | linux-09578eacaaa44149738267083ccc050990409f86.tar.xz | |
Merge tag 'asoc-v5.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: More updates for v5.5
Some more development work for v5.5. Highlights include:
- More cleanups from Morimoto-san.
- Trigger word detection for RT5677.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/vfio/vfio_iommu_type1.c')
| -rw-r--r-- | drivers/vfio/vfio_iommu_type1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vfio/vfio_iommu_type1.c b/drivers/vfio/vfio_iommu_type1.c index 96fddc1dafc3..d864277ea16f 100644 --- a/drivers/vfio/vfio_iommu_type1.c +++ b/drivers/vfio/vfio_iommu_type1.c @@ -1658,7 +1658,7 @@ static int vfio_iommu_type1_attach_group(void *iommu_data, struct bus_type *bus = NULL; int ret; bool resv_msi, msi_remap; - phys_addr_t resv_msi_base; + phys_addr_t resv_msi_base = 0; struct iommu_domain_geometry geo; LIST_HEAD(iova_copy); LIST_HEAD(group_resv_regions); |