From patchwork Wed Nov 24 16:02:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Drake X-Patchwork-Id: 353281 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAOG27cB004269 for ; Wed, 24 Nov 2010 16:02:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753034Ab0KXQCF (ORCPT ); Wed, 24 Nov 2010 11:02:05 -0500 Received: from mtaout02-winn.ispmail.ntl.com ([81.103.221.48]:3189 "EHLO mtaout02-winn.ispmail.ntl.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751867Ab0KXQCE (ORCPT ); Wed, 24 Nov 2010 11:02:04 -0500 Received: from aamtaout02-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout02-winn.ispmail.ntl.com (InterMail vM.7.08.04.00 201-2186-134-20080326) with ESMTP id <20101124160202.UWVT19887.mtaout02-winn.ispmail.ntl.com@aamtaout02-winn.ispmail.ntl.com>; Wed, 24 Nov 2010 16:02:02 +0000 Received: from zog.reactivated.net ([86.14.215.141]) by aamtaout02-winn.ispmail.ntl.com (InterMail vG.3.00.04.00 201-2196-133-20080908) with ESMTP id <20101124160202.NONF25842.aamtaout02-winn.ispmail.ntl.com@zog.reactivated.net>; Wed, 24 Nov 2010 16:02:02 +0000 Received: by zog.reactivated.net (Postfix, from userid 1000) id 294D79D401B; Wed, 24 Nov 2010 16:02:00 +0000 (GMT) From: Daniel Drake To: linville@tuxdriver.com Cc: s.neumann@raumfeld.com Cc: dcbw@redhat.com Cc: linux-wireless@vger.kernel.org Cc: libertas-dev@lists.infradead.org Cc: andrey@cozybit.com Subject: [PATCH 2/2] libertas: fix invalid access Message-Id: <20101124160200.294D79D401B@zog.reactivated.net> Date: Wed, 24 Nov 2010 16:02:00 +0000 (GMT) X-Cloudmark-Analysis: v=1.1 cv=X0sWjjQ37bMP4yB/pNNinY3VxVB2n/hmdAjhihaCFGs= c=1 sm=0 a=XKFAFTyXmVAA:10 a=oQNy927TAAAA:8 a=Op-mwl0xAAAA:8 a=uZAYpeJYLX7tkLiVQe8A:9 a=kl9l5iE58_vnlZ3Jlz4A:7 a=O9fkBxCd8W9mYnN-M7XwJQEXFsUA:4 a=7K-fXCmT7GkA:10 a=d4CUUju0HPYA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 24 Nov 2010 16:02:08 +0000 (UTC) diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c index e5685dc..b4de0ca 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c @@ -1170,7 +1170,6 @@ static void if_sdio_remove(struct sdio_func *func) lbs_deb_sdio("call remove card\n"); lbs_stop_card(card->priv); lbs_remove_card(card->priv); - card->priv->surpriseremoved = 1; flush_workqueue(card->workqueue); destroy_workqueue(card->workqueue); diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c index 79bcb4e..ecd4d04 100644 --- a/drivers/net/wireless/libertas/if_spi.c +++ b/drivers/net/wireless/libertas/if_spi.c @@ -1055,7 +1055,6 @@ static int __devexit libertas_spi_remove(struct spi_device *spi) lbs_stop_card(priv); lbs_remove_card(priv); /* will call free_netdev */ - priv->surpriseremoved = 1; free_irq(spi->irq, card); if_spi_terminate_spi_thread(card); if (card->pdata->teardown)