diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-26 22:01:26 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-26 22:01:26 -0400 |
| commit | 983f27d37d4fc72c252835cb2ee3103b360735a6 (patch) | |
| tree | 8a7d3c3e251db494e285896debeb906473178a3e /drivers/s390/net/qeth_proc.c | |
| parent | de1e938e54deba5b093a3074dfafd0d11afacbe1 (diff) | |
| parent | e82b0f2cc21be905e504573483fa9542b15df96f (diff) | |
| download | linux-stable-983f27d37d4fc72c252835cb2ee3103b360735a6.tar.gz | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/s390/net/ctctty.c
Diffstat (limited to 'drivers/s390/net/qeth_proc.c')
| -rw-r--r-- | drivers/s390/net/qeth_proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/net/qeth_proc.c b/drivers/s390/net/qeth_proc.c index 360d782c7ada..66f2da14e6e3 100644 --- a/drivers/s390/net/qeth_proc.c +++ b/drivers/s390/net/qeth_proc.c @@ -36,7 +36,7 @@ qeth_procfile_seq_start(struct seq_file *s, loff_t *offset) { struct device *dev = NULL; loff_t nr = 0; - + down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem); if (*offset == 0) return SEQ_START_TOKEN; @@ -60,8 +60,8 @@ static void * qeth_procfile_seq_next(struct seq_file *s, void *it, loff_t *offset) { struct device *prev, *next; - - if (it == SEQ_START_TOKEN) + + if (it == SEQ_START_TOKEN) prev = NULL; else prev = (struct device *) it; @@ -180,7 +180,7 @@ qeth_perf_procfile_seq_show(struct seq_file *s, void *it) struct device *device; struct qeth_card *card; - + if (it == SEQ_START_TOKEN) return 0; |