---

yaml --- r: 362239 b: refs/heads/master c: 090da75 h: refs/heads/master i: 362237: 9915c89 362235: 87f50fb 362231: 2dab49d 362223: 47f84ba 362207: 176346c 362175: a7c7ebf 362111: a1d7791 361983: 631f0ec v: v3
git-mirror · Apr 2, 2013 · dddeccd · dddeccd
1 parent 2dd2ae5
commit dddeccd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 477fc03f5baaf5906ce04beba7dbcd0e5d1e9b30
+refs/heads/master: 090da752cdd6f0786eee68c8dea8db7c8abd3798
diff --git a/trunk/drivers/video/uvesafb.c b/trunk/drivers/video/uvesafb.c
@@ -1973,7 +1973,8 @@ static int uvesafb_init(void)
 			err = -ENOMEM;
 
 		if (err) {
-			platform_device_put(uvesafb_device);
+			if (uvesafb_device)
+				platform_device_put(uvesafb_device);
 			platform_driver_unregister(&uvesafb_driver);
 			cn_del_callback(&uvesafb_cn_id);
 			return err;