diff --git a/[refs] b/[refs]
index 270d6aad4b20..9c99d21a76b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2896434cf272acace1b7093d5e4ba8022ed11ac8
+refs/heads/master: c6bed9deb6047179a6c58ace847f8b2129085e37
diff --git a/trunk/drivers/video/backlight/tps65217_bl.c b/trunk/drivers/video/backlight/tps65217_bl.c
index 6ac2ef5da32c..70881633b45a 100644
--- a/trunk/drivers/video/backlight/tps65217_bl.c
+++ b/trunk/drivers/video/backlight/tps65217_bl.c
@@ -312,6 +312,7 @@ static int tps65217_bl_probe(struct platform_device *pdev)
 	}
 
 	tps65217_bl->bl->props.brightness = 0;
+	platform_set_drvdata(pdev, tps65217_bl);
 
 	return 0;
 }
@@ -334,18 +335,7 @@ static struct platform_driver tps65217_bl_driver = {
 	},
 };
 
-static int __init tps65217_bl_init(void)
-{
-	return platform_driver_register(&tps65217_bl_driver);
-}
-
-static void __exit tps65217_bl_exit(void)
-{
-	platform_driver_unregister(&tps65217_bl_driver);
-}
-
-module_init(tps65217_bl_init);
-module_exit(tps65217_bl_exit);
+module_platform_driver(tps65217_bl_driver);
 
 MODULE_DESCRIPTION("TPS65217 Backlight driver");
 MODULE_LICENSE("GPL v2");