diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-06-10 20:34:40 +0200 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-06-28 15:14:27 +0200 |
| commit | 9e4b259d4fbf8a9c822117e734356e94b7f30927 (patch) | |
| tree | ab378986ba020efa32e1cb709085be44b06eda3c /arch/arm/mm/dma-mapping.c | |
| parent | ARM: dma-mapping: convert DMA direction into IOMMU protection attributes (diff) | |
| download | linux-9e4b259d4fbf8a9c822117e734356e94b7f30927.tar.xz linux-9e4b259d4fbf8a9c822117e734356e94b7f30927.zip | |
ARM: dma-mapping: NULLify dev->archdata.mapping pointer on detach
The current code only clobbers a local variable, so the device is left
with a stale mapping pointer.
Cc: Hiroshi Doyu <hdoyu@nvidia.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Acked-by: Hiroshi Doyu <hdoyu@nvidia.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 282aacd6f570..26a5833c9f29 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -1922,7 +1922,7 @@ void arm_iommu_detach_device(struct device *dev) iommu_detach_device(mapping->domain, dev); kref_put(&mapping->kref, release_iommu_mapping); - mapping = NULL; + dev->archdata.mapping = NULL; set_dma_ops(dev, NULL); pr_debug("Detached IOMMU controller from %s device.\n", dev_name(dev)); |