2 files changed, 27 insertions, 9 deletions

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index b2c292a66218..baac4ad5e68e 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -341,6 +341,19 @@ static struct platform_driver uml_net_driver = {
 };
 static int driver_registered;
 
+static void net_device_release(struct device *dev)
+{
+        struct uml_net *device = dev->driver_data;
+        struct net_device *netdev = device->dev;
+        struct uml_net_private *lp = netdev->priv;
+
+        if(lp->remove != NULL)
+                (*lp->remove)(&lp->user);
+        list_del(&device->list);
+        kfree(device);
+        free_netdev(netdev);
+}
+
 static void eth_configure(int n, void *init, char *mac,
                           struct transport *transport)
 {
@@ -396,6 +409,8 @@ static void eth_configure(int n, void *init, char *mac,
         }
         device->pdev.id = n;
         device->pdev.name = DRIVER_NAME;
+        device->pdev.dev.release = net_device_release;
+        device->pdev.dev.driver_data = device;
         if(platform_device_register(&device->pdev))
                 goto out_free_netdev;
         SET_NETDEV_DEV(dev,&device->pdev.dev);
@@ -689,13 +704,9 @@ static int net_remove(int n, char **error_out)
         lp = dev->priv;
         if(lp->fd > 0)
                 return -EBUSY;
-        if(lp->remove != NULL) (*lp->remove)(&lp->user);
         unregister_netdev(dev);
         platform_device_unregister(&device->pdev);
 
-        list_del(&device->list);
-        kfree(device);
-        free_netdev(dev);
         return 0;
 }
 
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 962b8fb35f80..83189e188c3f 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -622,6 +622,14 @@ static int ubd_open_dev(struct ubd *ubd_dev)
         return(err);
 }
 
+static void ubd_device_release(struct device *dev)
+{
+        struct ubd *ubd_dev = dev->driver_data;
+
+        blk_cleanup_queue(ubd_dev->queue);
+        *ubd_dev = ((struct ubd) DEFAULT_UBD);
+}
+
 static int ubd_disk_register(int major, u64 size, int unit,
                              struct gendisk **disk_out)
 {
@@ -644,6 +652,8 @@ static int ubd_disk_register(int major, u64 size, int unit,
         if (major == MAJOR_NR) {
                 ubd_devs[unit].pdev.id   = unit;
                 ubd_devs[unit].pdev.name = DRIVER_NAME;
+                ubd_devs[unit].pdev.dev.release = ubd_device_release;
+                ubd_devs[unit].pdev.dev.driver_data = &ubd_devs[unit];
                 platform_device_register(&ubd_devs[unit].pdev);
                 disk->driverfs_dev = &ubd_devs[unit].pdev.dev;
         }
@@ -787,7 +797,7 @@ static int ubd_id(char **str, int *start_out, int *end_out)
 
 static int ubd_remove(int n, char **error_out)
 {
-        struct gendisk *disk;
+        struct gendisk *disk = ubd_gendisk[n];
         struct ubd *ubd_dev;
         int err = -ENODEV;
 
@@ -803,7 +813,6 @@ static int ubd_remove(int n, char **error_out)
         if(ubd_dev->count > 0)
                 goto out;
 
-        disk = ubd_gendisk[n];
         ubd_gendisk[n] = NULL;
         if(disk != NULL){
                 del_gendisk(disk);
@@ -816,10 +825,8 @@ static int ubd_remove(int n, char **error_out)
                 fake_gendisk[n] = NULL;
         }
 
-        blk_cleanup_queue(ubd_dev->queue);
-        platform_device_unregister(&ubd_dev->pdev);
-        *ubd_dev = ((struct ubd) DEFAULT_UBD);
         err = 0;
+        platform_device_unregister(&ubd_dev->pdev);
 out:
         mutex_unlock(&ubd_lock);
         return err;