Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

[karo-tx-linux.git] / drivers / uio / uio_pdrv.c

diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c
index 5d0d2e85d9820ed70c48b900c262d7ff1c44f393..d494ce9288c37e9b59c34962c66b291f7185a313 100644 (file)
--- a/drivers/uio/uio_pdrv.c
+++ b/drivers/uio/uio_pdrv.c
@@ -12,7 +12,7 @@
 #include <linux/uio_driver.h>
 #include <linux/stringify.h>
 
-#define DRIVER_NAME "uio"
+#define DRIVER_NAME "uio_pdrv"
 
 struct uio_platdata {
        struct uio_info *uioinfo;
@@ -88,6 +88,8 @@ static int uio_pdrv_remove(struct platform_device *pdev)
 
        uio_unregister_device(pdata->uioinfo);
 
+       kfree(pdata);
+
        return 0;
 }
 
@@ -114,5 +116,5 @@ module_exit(uio_pdrv_exit);
 
 MODULE_AUTHOR("Uwe Kleine-Koenig");
 MODULE_DESCRIPTION("Userspace I/O platform driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" DRIVER_NAME);