On 04/10/16 18:03, Sricharan R wrote: > The dma_ops for the device is not getting set to NULL in > arch_tear_down_dma_ops and this causes an issue when the > device's probe gets deferred and retried. So reset the > dma_ops to NULL. Reviewed-by: Robin Murphy <robin.murphy@xxxxxxx> This seems like it could stand independently from the rest of the series - might be worth rewording the commit message to more general terms, i.e. arch_teardown_dma_ops() being the inverse of arch_setup_dma_ops() thus clearing the ops set by the latter, and sending it to Russell as a fix in its own right. Robin. > Signed-off-by: Sricharan R <sricharan@xxxxxxxxxxxxxx> > --- > arch/arm/mm/dma-mapping.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c > index dde6514..b9191f0 100644 > --- a/arch/arm/mm/dma-mapping.c > +++ b/arch/arm/mm/dma-mapping.c > @@ -2295,6 +2295,7 @@ static void arm_teardown_iommu_dma_ops(struct device *dev) > > __arm_iommu_detach_device(dev); > arm_iommu_release_mapping(mapping); > + set_dma_ops(dev, NULL); > } > > #else > -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html