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

Merge tag 'driver-core-5.17-rc6' of... 

Merge tag 'driver-core-5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core fix from Greg KH:
 "Here is a single driver core fix for 5.17-rc6. It resolves a reported
  problem when the DMA map of a device is not properly released.

  It has been in linux-next with no reported problems"

* tag 'driver-core-5.17-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  driver core: Free DMA range map when device is released
parents eae9350e d8f7a548

drivers/base/dd.c

+5 −0
Original line number Diff line number Diff line
@@ -629,6 +629,9 @@ static int really_probe(struct device *dev, struct device_driver *drv) 
			drv->remove(dev);



		devres_release_all(dev);

		arch_teardown_dma_ops(dev);

		kfree(dev->dma_range_map);

		dev->dma_range_map = NULL;

		driver_sysfs_remove(dev);

		dev->driver = NULL;

		dev_set_drvdata(dev, NULL);
@@ -1209,6 +1212,8 @@ static void __device_release_driver(struct device *dev, struct device *parent) 


		devres_release_all(dev);

		arch_teardown_dma_ops(dev);

		kfree(dev->dma_range_map);

		dev->dma_range_map = NULL;

		dev->driver = NULL;

		dev_set_drvdata(dev, NULL);

		if (dev->pm_domain && dev->pm_domain->dismiss)