From patchwork Fri Jan 18 07:24:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lubomir Rintel X-Patchwork-Id: 213501 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 01A5E2C0080 for ; Fri, 18 Jan 2013 18:25:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751544Ab3ARHY4 (ORCPT ); Fri, 18 Jan 2013 02:24:56 -0500 Received: from norkia.v3.sk ([91.210.183.14]:46614 "EHLO norkia.v3.sk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751143Ab3ARHYz (ORCPT ); Fri, 18 Jan 2013 02:24:55 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by norkia.v3.sk (Postfix) with ESMTP id 86C3412A0E4; Fri, 18 Jan 2013 08:24:52 +0100 (CET) X-Virus-Scanned: amavisd-new at v3.sk Received: from norkia.v3.sk ([127.0.0.1]) by localhost (norkia.v3.sk [127.0.0.1]) (amavisd-new, port 10024) with SMTP id JTZ4TDa-nzPe; Fri, 18 Jan 2013 08:24:49 +0100 (CET) Received: from localhost.localdomain (ip-94-113-108-27.net.upcbroadband.cz [94.113.108.27]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: lkundrak@v3.sk) by norkia.v3.sk (Postfix) with ESMTP id 8A3F512A0E3; Fri, 18 Jan 2013 08:24:48 +0100 (CET) From: Lubomir Rintel To: Harro Haan , Dan Williams Cc: "John W. Linville" , libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Lubomir Rintel Subject: [PATCH] libertas sdio: remove CMD_FUNC_INIT call Date: Fri, 18 Jan 2013 08:24:43 +0100 Message-Id: <1358493883-28433-1-git-send-email-lkundrak@v3.sk> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It actually times out on a 8688 present in GuruPlug with sd8688.bin (md5=7233401e9687f8c880da547beed4324e) firmware (that's present in linux-firmware tree), but the adapter works fine. For that firmware times out with libertas_uap [1] as well, though it succeeds with sd8688_ap.bin (md5=52cd8f8296b9a7e1d3835d57416256b2) that was originally shipped with GuruPlug. That firmware is not in linux-firmware tree and btmrvl driver might win the race programming the 8688 with sd8688.bin anyway. [1] https://github.com/lkundrak/linux/tree/libertas_uap --- drivers/net/wireless/libertas/if_sdio.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c index 2ecab49..3c4c555 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c @@ -825,20 +825,6 @@ static void if_sdio_finish_power_on(struct if_sdio_card *card) sdio_release_host(func); - /* - * FUNC_INIT is required for SD8688 WLAN/BT multiple functions - */ - if (card->model == MODEL_8688) { - struct cmd_header cmd; - - memset(&cmd, 0, sizeof(cmd)); - - lbs_deb_sdio("send function INIT command\n"); - if (__lbs_cmd(priv, CMD_FUNC_INIT, &cmd, sizeof(cmd), - lbs_cmd_copyback, (unsigned long) &cmd)) - netdev_alert(priv->dev, "CMD_FUNC_INIT cmd failed\n"); - } - priv->fw_ready = 1; wake_up(&card->pwron_waitq);