commit 39663ff54367064e861394f14fa6f3803cf00914 ("libertas: provide
reset_card() callback on OLPC") introduced a pair of warnings:
CC [M] drivers/net/wireless/libertas/if_usb.o
drivers/net/wireless/libertas/if_usb.c: In function ‘if_usb_reset_olpc_card’:
drivers/net/wireless/libertas/if_usb.c:158: warning: no return statement in function returning non-void
drivers/net/wireless/libertas/if_usb.c: In function ‘if_usb_probe’: drivers/net/wireless/libertas/if_usb.c:248: warning: assignment from incompatible pointer type
Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
---
I'll fold this into the original patch, which has not yet been sent
upstream.
drivers/net/wireless/libertas/if_usb.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 8a7eb63..2478310 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -151,7 +151,7 @@ static void if_usb_fw_timeo(unsigned long priv)
}
#ifdef CONFIG_OLPC
-static int if_usb_reset_olpc_card(struct lbs_private *priv)
+static void if_usb_reset_olpc_card(struct lbs_private *priv)
{
printk(KERN_CRIT "Resetting OLPC wireless via EC...\n");
olpc_ec_cmd(0x25, NULL, 0, NULL, 0);
--
1.5.5.1
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
