From mboxrd@z Thu Jan 1 00:00:00 1970 From: mjr@cs.wisc.edu Subject: [PATCH] ks8851: Fix missing mutex_lock/unlock Date: Thu, 12 Apr 2012 16:28:20 -0500 Message-ID: <1334266100-9875-1-git-send-email-mjr@cs.wisc.edu> Cc: davem@davemloft.net, sboyd@codeaurora.org, ben@simtec.co.uk, netdev@vger.kernel.org, Matt Renzelmann To: fbl@redhat.com Return-path: Received: from sabe.cs.wisc.edu ([128.105.6.20]:47889 "EHLO sabe.cs.wisc.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762860Ab2DLVdY (ORCPT ); Thu, 12 Apr 2012 17:33:24 -0400 Sender: netdev-owner@vger.kernel.org List-ID: 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. Thanks to Stephen Boyd and Flavio Leitner for feedback. Signed-off-by: Matt Renzelmann --- Here's the next revision. This is basically Flavio Leitner's latest version without the mutex. Please let me know if I'm missing anything and I can re-submit it. drivers/net/ethernet/micrel/ks8851.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/micrel/ks8851.c b/drivers/net/ethernet/micrel/ks8851.c index c722aa6..6528d66 100644 --- a/drivers/net/ethernet/micrel/ks8851.c +++ b/drivers/net/ethernet/micrel/ks8851.c @@ -1418,6 +1418,7 @@ static int __devinit ks8851_probe(struct spi_device *spi) struct net_device *ndev; struct ks8851_net *ks; int ret; + unsigned cider; ndev = alloc_etherdev(sizeof(struct ks8851_net)); if (!ndev) @@ -1484,8 +1485,8 @@ static int __devinit ks8851_probe(struct spi_device *spi) ks8851_soft_reset(ks, GRR_GSR); /* simple check for a valid chip being connected to the bus */ - - if ((ks8851_rdreg16(ks, KS_CIDER) & ~CIDER_REV_MASK) != CIDER_ID) { + cider = CIDER_REV_GET(ks8851_rdreg16(ks, KS_CIDER)); + if ((cider & ~CIDER_REV_MASK) != CIDER_ID) { dev_err(&spi->dev, "failed to read device ID\n"); ret = -ENODEV; goto err_id; @@ -1516,8 +1517,7 @@ static int __devinit ks8851_probe(struct spi_device *spi) } 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, + CIDER_REV_GET(cider), ndev->dev_addr, ndev->irq, ks->rc_ccr & CCR_EEPROM ? "has" : "no"); return 0; -- 1.7.5.4