diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 14:18:36 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 14:18:36 -0700 |
| commit | 7e66eaf14e19c032433be7c4df3c892fa2a5282f (patch) | |
| tree | 56b0d5f9d16eb18744e102f3f216715196cd62e6 /drivers/net/tokenring/3c359.c | |
| parent | d3654d7ef3adad0083525cfb6fe27be62cb83d0d (diff) | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
| download | lwn-7e66eaf14e19c032433be7c4df3c892fa2a5282f.tar.gz lwn-7e66eaf14e19c032433be7c4df3c892fa2a5282f.zip | |
Merge commit 'v3.1-rc4' into next
Diffstat (limited to 'drivers/net/tokenring/3c359.c')
| -rw-r--r-- | drivers/net/tokenring/3c359.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index ff32befd8443..b6162fe2348e 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c @@ -304,7 +304,7 @@ static int __devinit xl_probe(struct pci_dev *pdev, if ((i = pci_request_regions(pdev,"3c359"))) { return i ; - } ; + } /* * Allowing init_trdev to allocate the private data will align @@ -1773,7 +1773,9 @@ static void xl_wait_misr_flags(struct net_device *dev) if (readb(xl_mmio + MMIO_MACDATA) != 0) { /* Misr not clear */ for (i=0; i<6; i++) { writel(MEM_BYTE_READ | 0xDFFE0 | i, xl_mmio + MMIO_MAC_ACCESS_CMD) ; - while (readb(xl_mmio + MMIO_MACDATA) != 0 ) {} ; /* Empty Loop */ + while (readb(xl_mmio + MMIO_MACDATA) != 0) { + ; /* Empty Loop */ + } } } |