diff options
author | 2009-03-17 09:28:13 +0100 | |
---|---|---|
committer | 2009-03-17 09:28:13 +0100 | |
commit | 37ba1b62836d2440980cf553c49556393b05c6cd (patch) | |
tree | 3bbd9b76117d484d5a624db1b2b9ec0181c7ff55 /drivers/net/via-velocity.c | |
parent | ALSA: opl3sa2 fix irq releasing and short name of card (diff) | |
parent | ALSA: opl3sa2 - Fix NULL dereference when suspending snd_opl3sa2 (diff) | |
download | linux-dev-37ba1b62836d2440980cf553c49556393b05c6cd.tar.xz linux-dev-37ba1b62836d2440980cf553c49556393b05c6cd.zip |
Merge branch 'fix/opl3sa2-suspend' into topic/isa-misc
Diffstat (limited to 'drivers/net/via-velocity.c')
-rw-r--r-- | drivers/net/via-velocity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index a75f91dc3153..c5691fdb7079 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c @@ -1302,7 +1302,7 @@ static void velocity_free_rd_ring(struct velocity_info *vptr) static int velocity_init_td_ring(struct velocity_info *vptr) { dma_addr_t curr; - unsigned int j; + int j; /* Init the TD ring entries */ for (j = 0; j < vptr->tx.numq; j++) { |