From 759719f64995468b6b0967648436c20db53b28d3 Mon Sep 17 00:00:00 2001
From: Julien Brunel <brunel@diku.dk>
Date: Mon, 1 Sep 2008 10:57:27 +0200
Subject: [PATCH] --- yaml --- r: 115751 b: refs/heads/master c:
 bedf0883cbe3015d21aec5ed47ddffb429f6cca7 h: refs/heads/master i:   115749:
 b41cd2db52e64b8d3c9f5e8631d6cf1ef3d4de7e   115747:
 e769d72a81f65d29e0d371e11738545aa3574bae   115743:
 73b10d20db2389c77494b6cad65e9141e4a10972 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/usb/misc/appledisplay.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9b5c7e2c03d0..ddabba7fd435 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58209018cfd6f1fa8d0139af7c39dbfe73de21fd
+refs/heads/master: bedf0883cbe3015d21aec5ed47ddffb429f6cca7
diff --git a/trunk/drivers/usb/misc/appledisplay.c b/trunk/drivers/usb/misc/appledisplay.c
index a076c24a312a..71d672ea1229 100644
--- a/trunk/drivers/usb/misc/appledisplay.c
+++ b/trunk/drivers/usb/misc/appledisplay.c
@@ -314,7 +314,7 @@ static int appledisplay_probe(struct usb_interface *iface,
 					pdata->urbdata, pdata->urb->transfer_dma);
 			usb_free_urb(pdata->urb);
 		}
-		if (pdata->bd)
+		if (pdata->bd && !IS_ERR(pdata->bd))
 			backlight_device_unregister(pdata->bd);
 		kfree(pdata->msgdata);
 	}