From 45134c264ebd6d816b9ee87a00844039ed0ef760 Mon Sep 17 00:00:00 2001 From: Eric Sesterhenn Date: Tue, 3 Oct 2006 23:34:11 +0200 Subject: [PATCH] --- yaml --- r: 38327 b: refs/heads/master c: 644c12d7f695c0a30662ac781b0f06f79d7f9bab h: refs/heads/master i: 38325: d93e7818887e8ef9832363726dfdb04fd8b618f0 38323: 99c4ed19dac86b0948b73462fe8f41ac0b0158a5 38319: caccaeb2890b2b254cb94c70f99fe54e86bdb364 v: v3 --- [refs] | 2 +- trunk/drivers/net/tokenring/tmspci.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index da657740542f..c7b5c86baeac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52e5f9d1cf0b10b24317037dcd1c9be38ca7011c +refs/heads/master: 644c12d7f695c0a30662ac781b0f06f79d7f9bab diff --git a/trunk/drivers/net/tokenring/tmspci.c b/trunk/drivers/net/tokenring/tmspci.c index 7d3e270c4f45..3b2f00b9b7bd 100644 --- a/trunk/drivers/net/tokenring/tmspci.c +++ b/trunk/drivers/net/tokenring/tmspci.c @@ -224,8 +224,7 @@ static void __devexit tms_pci_detach (struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev); - if (!dev) - BUG(); + BUG_ON(!dev); unregister_netdev(dev); release_region(dev->base_addr, TMS_PCI_IO_EXTENT); free_irq(dev->irq, dev);