All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] misc: mic: replace kfree with put_device
@ 2015-09-29 16:58 Geliang Tang
  2015-10-04 11:57 ` Greg Kroah-Hartman
  0 siblings, 1 reply; 4+ messages in thread
From: Geliang Tang @ 2015-09-29 16:58 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Ashutosh Dixit, Sudeep Dutt, Nikhil Rao
  Cc: Geliang Tang, linux-kernel

Handle a failed device_register(), replace kfree() with put_device(),
which will call mbus_release_dev() or scif_release_dev().

Signed-off-by: Geliang Tang <geliangtang@163.com>
---
 drivers/misc/mic/bus/mic_bus.c  | 2 +-
 drivers/misc/mic/bus/scif_bus.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/mic/bus/mic_bus.c b/drivers/misc/mic/bus/mic_bus.c
index 961ae90..a25be8d 100644
--- a/drivers/misc/mic/bus/mic_bus.c
+++ b/drivers/misc/mic/bus/mic_bus.c
@@ -185,7 +185,7 @@ mbus_register_device(struct device *pdev, int id, struct dma_map_ops *dma_ops,
 ida_remove:
 	ida_simple_remove(&mbus_index_ida, mbdev->index);
 free_mbdev:
-	kfree(mbdev);
+	put_device(&mbdev->dev);
 	return ERR_PTR(ret);
 }
 EXPORT_SYMBOL_GPL(mbus_register_device);
diff --git a/drivers/misc/mic/bus/scif_bus.c b/drivers/misc/mic/bus/scif_bus.c
index 2da7cee..8972ae7 100644
--- a/drivers/misc/mic/bus/scif_bus.c
+++ b/drivers/misc/mic/bus/scif_bus.c
@@ -181,7 +181,7 @@ scif_register_device(struct device *pdev, int id, struct dma_map_ops *dma_ops,
 		goto free_sdev;
 	return sdev;
 free_sdev:
-	kfree(sdev);
+	put_device(&sdev->dev);
 	return ERR_PTR(ret);
 }
 EXPORT_SYMBOL_GPL(scif_register_device);
-- 
2.5.0



^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-10-11 21:12 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-29 16:58 [PATCH] misc: mic: replace kfree with put_device Geliang Tang
2015-10-04 11:57 ` Greg Kroah-Hartman
2015-10-05  0:33   ` [PATCH v2] " Geliang Tang
2015-10-11 21:12     ` Ashutosh Dixit

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.