x86/dma-mapping: Fix arch_dma_alloc_attrs() oops with NULL dev
Commit 6894258e broke drivers that pass NULL as the device pointer to dma_alloc. The reason is that arch_dma_alloc_attrs() now calls dma_alloc_coherent_gfp_flags() which in turn calls dma_alloc_coherent_mask(), where the device pointer is dereferenced unconditionally. Fix things by moving the ISA DMA fallback device assignment before the call to dma_alloc_coherent_gfp_flags(). Fixes: 6894258e ("dma-mapping: consolidate dma_{alloc,free}_{attrs,coherent}") Reported-and-tested-by:Meelis Roos <mroos@linux.ee> Signed-off-by:
Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Christoph Hellwig <hch@lst.de> Link: http://lkml.kernel.org/r/1445807503-8920-1-git-send-email-ville.syrjala@linux.intel.comSigned-off-by:
Thomas Gleixner <tglx@linutronix.de>
Showing
Please register or sign in to comment