From dddeccd0146d36ed0a413cfcf1ea36d494bb4d0d Mon Sep 17 00:00:00 2001
From: Wang YanQing <udknight@gmail.com>
Date: Sat, 30 Mar 2013 04:53:00 +0200
Subject: [PATCH] --- yaml --- r: 362239 b: refs/heads/master c:
 090da752cdd6f0786eee68c8dea8db7c8abd3798 h: refs/heads/master i:   362237:
 9915c894bf345a488d64e3c435150315fc9be132   362235:
 87f50fb5d0c04b26143f432300c6f234e37980a0   362231:
 2dab49dba3486bb84567db80a27561799b6636eb   362223:
 47f84ba9b552b74d0800921f7875a24f26b054af   362207:
 176346cece181cb91460d55a05fe77969aff7d60   362175:
 a7c7ebf9324228fcfaa7dc808c78e947bb7d116c   362111:
 a1d7791b5511f7db00ef25d65aedfceb4e73e288   361983:
 631f0ec11319fc51bfee77a947d5354f238eb81a v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/video/uvesafb.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7507bce6ac74..ab35ebb51998 100644
--- 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
index b75db0186488..d4284458377e 100644
--- 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;