Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2626876 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-5.3-2' of git://git.infradead.org/users/hch/dma-mapping 

Pull dma-mapping regression fix from Christoph Hellwig:
 "Ensure that dma_addressing_limited doesn't crash on devices without a
  dma mask (Eric Auger)"

* tag 'dma-mapping-5.3-2' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: use dma_get_mask in dma_addressing_limited
parents ad5e427e 06532750

include/linux/dma-mapping.h

+2 −2
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask) 
 */

static inline bool dma_addressing_limited(struct device *dev)

{

	return min_not_zero(*dev->dma_mask, dev->bus_dma_mask) <

	return min_not_zero(dma_get_mask(dev), dev->bus_dma_mask) <

			    dma_get_required_mask(dev);

}