renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 14:14:01 +08:00
Code

ks8851: Fix missing mutex_lock/unlock

Browse Source 
Move the ks8851_rdreg16 call above the call to request_irq and cache
the result for subsequent repeated use.  A spurious interrupt may
otherwise cause a crash.  Thanks to Stephen Boyd, Flavio Leitner, and
Ben Hutchings for feedback.

Signed-off-by: Matt Renzelmann <mjr@cs.wisc.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Matt Renzelmann 2012-04-13 07:59:40 +00:00 committed by David S. Miller
parent 59a54f3082
commit 51c61a2838
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/micrel/ks8851.c
View File

@ -1418,6 +1418,7 @@ static int __devinit ks8851_probe(struct spi_device *spi)
struct net_device *ndev; struct net_device *ndev;
struct ks8851_net *ks; struct ks8851_net *ks;
int ret; int ret;
unsigned cider;
ndev = alloc_etherdev(sizeof(struct ks8851_net)); ndev = alloc_etherdev(sizeof(struct ks8851_net));
if (!ndev) if (!ndev)
@ -1484,8 +1485,8 @@ static int __devinit ks8851_probe(struct spi_device *spi)
ks8851_soft_reset(ks, GRR_GSR); ks8851_soft_reset(ks, GRR_GSR);
/* simple check for a valid chip being connected to the bus */ /* simple check for a valid chip being connected to the bus */
cider = ks8851_rdreg16(ks, KS_CIDER);
if ((ks8851_rdreg16(ks, KS_CIDER) & ~CIDER_REV_MASK) != CIDER_ID) { if ((cider & ~CIDER_REV_MASK) != CIDER_ID) {
dev_err(&spi->dev, "failed to read device ID\n"); dev_err(&spi->dev, "failed to read device ID\n");
ret = -ENODEV; ret = -ENODEV;
goto err_id; 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", netdev_info(ndev, "revision %d, MAC %pM, IRQ %d, %s EEPROM\n",
CIDER_REV_GET(ks8851_rdreg16(ks, KS_CIDER)), CIDER_REV_GET(cider), ndev->dev_addr, ndev->irq,
ndev->dev_addr, ndev->irq,
ks->rc_ccr & CCR_EEPROM ? "has" : "no"); ks->rc_ccr & CCR_EEPROM ? "has" : "no");
return 0; return 0;