From bd6b65c3236ea4007b8cfe2fdac7e02cb5640065 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Sat, 14 May 2011 00:26:21 +0300
Subject: [PATCH] --- yaml --- r: 256207 b: refs/heads/master c:
 77d7d7a36d270fee4591c1c99c83c2da1f399d44 h: refs/heads/master i:   256205:
 359b142f3bb7837c2ca296c7e6c4027fe454fa47   256203:
 6dd8375f8e073b5ea56c43369cc8384179ded464   256199:
 6084408c159e29ac6cfde7cf6f395069ca08abad   256191:
 c23d2f5d0640da6035d5b4264d9fc3634e038a7e v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/wireless/wl12xx/io.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ca9da5140e4f..28732ef46f53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bdaf79623e285242cb977840358dc7d14438475
+refs/heads/master: 77d7d7a36d270fee4591c1c99c83c2da1f399d44
diff --git a/trunk/drivers/net/wireless/wl12xx/io.c b/trunk/drivers/net/wireless/wl12xx/io.c
index da5c1ad942a4..f37a7933f900 100644
--- a/trunk/drivers/net/wireless/wl12xx/io.c
+++ b/trunk/drivers/net/wireless/wl12xx/io.c
@@ -128,12 +128,14 @@ EXPORT_SYMBOL_GPL(wl1271_set_partition);
 
 void wl1271_io_reset(struct wl1271 *wl)
 {
-	wl->if_ops->reset(wl);
+	if (wl->if_ops->reset)
+		wl->if_ops->reset(wl);
 }
 
 void wl1271_io_init(struct wl1271 *wl)
 {
-	wl->if_ops->init(wl);
+	if (wl->if_ops->init)
+		wl->if_ops->init(wl);
 }
 
 void wl1271_top_reg_write(struct wl1271 *wl, int addr, u16 val)