diff --git a/[refs] b/[refs]
index 119513385177..ff8b5139dfba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6345c81b4eb20850ae4078ed3a8ff6eae584283
+refs/heads/master: fd67859d380b4c2af160d4aa3d8041bf63d7bd36
diff --git a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
index 0c0b6035cb04..73951963c018 100644
--- a/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/trunk/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -808,8 +808,10 @@ static int __devinit smtcfb_pci_probe(struct pci_dev *pdev,
 
 	sfb = smtc_alloc_fb_info(pdev, name);
 
-	if (!sfb)
+	if (!sfb) {
+		err = -ENOMEM;
 		goto failed_free;
+	}
 
 	sfb->chip_id = ent->device;
 	sprintf(name, "sm%Xfb", sfb->chip_id);