diff --git a/[refs] b/[refs]
index 77db59cff4de..5349fede23f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1646ec9db75e151b0479dbfaf972f741d0476ec7
+refs/heads/master: 4c4dd903e72507c853b8c2b04b22e0d0c721fd93
diff --git a/trunk/drivers/video/backlight/aat2870_bl.c b/trunk/drivers/video/backlight/aat2870_bl.c
index 4952a617563d..f13a3f7e2e8f 100644
--- a/trunk/drivers/video/backlight/aat2870_bl.c
+++ b/trunk/drivers/video/backlight/aat2870_bl.c
@@ -158,10 +158,10 @@ static int aat2870_bl_probe(struct platform_device *pdev)
 	props.type = BACKLIGHT_RAW;
 	bd = backlight_device_register("aat2870-backlight", &pdev->dev,
 				       aat2870_bl, &aat2870_bl_ops, &props);
-	if (!bd) {
+	if (IS_ERR(bd)) {
 		dev_err(&pdev->dev,
 			"Failed allocate memory for backlight device\n");
-		ret = -ENOMEM;
+		ret = PTR_ERR(bd);
 		goto out_kfree;
 	}