git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
[pandora-kernel.git]
/
drivers
/
net
/
enic
/
vnic_rq.c
diff --git
a/drivers/net/enic/vnic_rq.c
b/drivers/net/enic/vnic_rq.c
index
e186efa
..
cc580cf
100644
(file)
--- a/
drivers/net/enic/vnic_rq.c
+++ b/
drivers/net/enic/vnic_rq.c
@@
-168,10
+168,10
@@
int vnic_rq_disable(struct vnic_rq *rq)
iowrite32(0, &rq->ctrl->enable);
/* Wait for HW to ACK disable request */
iowrite32(0, &rq->ctrl->enable);
/* Wait for HW to ACK disable request */
- for (wait = 0; wait < 100; wait++) {
+ for (wait = 0; wait < 100
0
; wait++) {
if (!(ioread32(&rq->ctrl->running)))
return 0;
if (!(ioread32(&rq->ctrl->running)))
return 0;
- udelay(1);
+ udelay(1
0
);
}
printk(KERN_ERR "Failed to disable RQ[%d]\n", rq->index);
}
printk(KERN_ERR "Failed to disable RQ[%d]\n", rq->index);