Skip to contentSkip to conversation

vme: add missing put_device() after device_register() fails

PATCH In review Emilio G. Cota 2 participants 2 messages Feb 13, 2013 – Feb 25, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vme: add missing put_device() after device_register() fails

From: "Emilio G. Cota" <[email protected]>

put_device() must be called after device_register() fails, since device_register() always initializes the refcount on the device structure.

---
 drivers/vme/vme.c |    1 +
 1 file changed, 1 insertion(+)
drivers/vme/vme.c +1 -0
index 95a9f71..5e6c7d7 100644
@@ -1366,26 +1366,27 @@ static int __vme_register_driver_bus(struct vme_driver *drv,
 		err = device_register(&vdev->dev);
 		if (err)
 			goto err_reg;
 
 		if (vdev->dev.platform_data) {
 			list_add_tail(&vdev->drv_list, &drv->devices);
 			list_add_tail(&vdev->bridge_list, &bridge->devices);
 		} else
 			device_unregister(&vdev->dev);
 	}
 	return 0;
 
 err_reg:
+	put_device(&vdev->dev);
 	kfree(vdev);
 err_devalloc:
 	list_for_each_entry_safe(vdev, tmp, &drv->devices, drv_list) {
 		list_del(&vdev->drv_list);
 		list_del(&vdev->bridge_list);
 		device_unregister(&vdev->dev);
 	}
 	return err;
 }
 
 static int __vme_register_driver(struct vme_driver *drv, unsigned int ndevs)
 {
 	struct vme_bridge *bridge;
Signature · 1 line
1.7.9.5
Acked-by on v1 1/1
#1 lore raw
Quoted 29 lines · Emilio G. Cota

From: "Emilio G. Cota" <[email protected]>

put_device() must be called after device_register() fails, since device_register() always initializes the refcount on the device structure.

---
 drivers/vme/vme.c |    1 +
 1 file changed, 1 insertion(+)
drivers/vme/vme.c +0 -0
index 95a9f71..5e6c7d7 100644
@@ -1366,26 +1366,27 @@ static int __vme_register_driver_bus(struct vme_driver *drv,
 		err = device_register(&vdev->dev);
 		if (err)
 			goto err_reg;
 
 		if (vdev->dev.platform_data) {
 			list_add_tail(&vdev->drv_list, &drv->devices);
 			list_add_tail(&vdev->bridge_list, &bridge->devices);
 		} else
 			device_unregister(&vdev->dev);
 	}
 	return 0;
 
 err_reg:

drivers/vme/vme.c static int __vme_register_driver_bus(struct vme_driver *drv, · line 1388

Quoted 10 lines
drivers/vme/vme.c +1 -0
+	put_device(&vdev->dev);
 	kfree(vdev);
 err_devalloc:
 	list_for_each_entry_safe(vdev, tmp, &drv->devices, drv_list) {
 		list_del(&vdev->drv_list);
 		list_del(&vdev->bridge_list);
 		device_unregister(&vdev->dev);
 	}
 	return err;
 }

(Sorry it took me so long to respond)

Quoted 5 lines
drivers/vme/vme.c +0 -0
 static int __vme_register_driver(struct vme_driver *drv, unsigned int ndevs)
 {
 	struct vme_bridge *bridge;
 
Signature · 4 lines
Martyn Welch (Lead Software Engineer)  | Registered in England and Wales
GE Intelligent Platforms               | (3828642) at 100 Barbirolli Square
T +44(0)1327322748                     | Manchester, M2 3AB
E [email protected]                  | VAT:GB 927559189