---

yaml --- r: 256207 b: refs/heads/master c: 77d7d7a h: refs/heads/master i: 256205: 359b142 256203: 6dd8375 256199: 6084408 256191: c23d2f5 v: v3
git-mirror · Jun 27, 2011 · bd6b65c · bd6b65c
1 parent 8ca91ab
commit bd6b65c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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)