From patchwork Thu Apr 12 20:06:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mjr@cs.wisc.edu X-Patchwork-Id: 152170 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 4A2E7B70B7 for ; Fri, 13 Apr 2012 06:13:05 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755903Ab2DLUND (ORCPT ); Thu, 12 Apr 2012 16:13:03 -0400 Received: from sabe.cs.wisc.edu ([128.105.6.20]:47704 "EHLO sabe.cs.wisc.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752848Ab2DLUNB (ORCPT ); Thu, 12 Apr 2012 16:13:01 -0400 Received: from localhost.localdomain (71-90-102-157.dhcp.ftbg.wi.charter.com [71.90.102.157]) (authenticated bits=0) by sabe.cs.wisc.edu (8.14.1/8.14.1) with ESMTP id q3CKBIhQ007353 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 12 Apr 2012 15:12:04 -0500 From: mjr@cs.wisc.edu To: fbl@redhat.com Cc: davem@davemloft.net, sboyd@codeaurora.org, ben@simtec.co.uk, netdev@vger.kernel.org, Matt Renzelmann Subject: [PATCH] ks8851: Fix missing mutex_lock/unlock Date: Thu, 12 Apr 2012 15:06:44 -0500 Message-Id: <1334261204-8554-1-git-send-email-mjr@cs.wisc.edu> X-Mailer: git-send-email 1.7.5.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Matt Renzelmann All calls to ks8851_rdreg* and ks8851_wrreg* should be protected with the driver's lock mutex. A spurious interrupt may otherwise cause a crash. Signed-off-by: Matt Renzelmann Signed-off-by: Flavio Leitner --- Thank you, Mr. Leitner, for providing feedback. I agree with your changes and have updated the patch to reflect them. I apologize for missing the driver name in the title -- I've updated the patch with that information as well. Please let me know if there is anything else I should fix/change. drivers/net/ethernet/micrel/ks8851.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c index c722aa6..20237dc 100644 --- a/drivers/net/ethernet/micrel/ks8851.c +++ b/drivers/net/ethernet/micrel/ks8851.c @@ -1417,6 +1417,7 @@ static int __devinit ks8851_probe(struct spi_device *spi) { struct net_device *ndev; struct ks8851_net *ks; + int result; int ret; ndev = alloc_etherdev(sizeof(struct ks8851_net)); @@ -1515,9 +1516,12 @@ static int __devinit ks8851_probe(struct spi_device *spi) goto err_netdev; } + mutex_lock(&ks->lock); + result = CIDER_REV_GET(ks8851_rdreg16(ks, KS_CIDER)); + mutex_unlock(&ks->lock); + netdev_info(ndev, "revision %d, MAC %pM, IRQ %d, %s EEPROM\n", - CIDER_REV_GET(ks8851_rdreg16(ks, KS_CIDER)), - ndev->dev_addr, ndev->irq, + result, ndev->dev_addr, ndev->irq, ks->rc_ccr & CCR_EEPROM ? "has" : "no"); return 0;