From 8230abb43e73b0dc3046c6a43eb6c51da368296c Mon Sep 17 00:00:00 2001
From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 6 Jan 2012 06:00:48 +0400
Subject: [PATCH] --- yaml --- r: 283481 b: refs/heads/master c:
 c934502db7fda4fac1bb3b5c74f35e9bde8e7547 h: refs/heads/master i:   283479:
 7e966c1f1f57faa27b72c941faafd6abcaeb77db v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/power/isp1704_charger.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ad0585ab0b80..0810bb4325b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef7906f3204280ccaf8cd7ace974b7c0a1393812
+refs/heads/master: c934502db7fda4fac1bb3b5c74f35e9bde8e7547
diff --git a/trunk/drivers/power/isp1704_charger.c b/trunk/drivers/power/isp1704_charger.c
index 6a4ef387a183..b806667b59ae 100644
--- a/trunk/drivers/power/isp1704_charger.c
+++ b/trunk/drivers/power/isp1704_charger.c
@@ -79,7 +79,7 @@ static void isp1704_charger_set_power(struct isp1704_charger *isp, bool on)
 {
 	struct isp1704_charger_data	*board = isp->dev->platform_data;
 
-	if (board->set_power)
+	if (board && board->set_power)
 		board->set_power(on);
 }