diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
| commit | 17f7f4d9fcce8f1b75b5f735569309dee7665968 (patch) | |
| tree | 14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a /drivers/s390/cio/qdio_thinint.c | |
| parent | 041110a439e21cd40709ead4ffbfa8034619ad77 (diff) | |
| parent | d7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.c
Diffstat (limited to 'drivers/s390/cio/qdio_thinint.c')
| -rw-r--r-- | drivers/s390/cio/qdio_thinint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c index 752dbee06af5..5d9c66627b6e 100644 --- a/drivers/s390/cio/qdio_thinint.c +++ b/drivers/s390/cio/qdio_thinint.c | |||
| @@ -292,8 +292,8 @@ void qdio_shutdown_thinint(struct qdio_irq *irq_ptr) | |||
| 292 | return; | 292 | return; |
| 293 | 293 | ||
| 294 | /* reset adapter interrupt indicators */ | 294 | /* reset adapter interrupt indicators */ |
| 295 | put_indicator(irq_ptr->dsci); | ||
| 296 | set_subchannel_ind(irq_ptr, 1); | 295 | set_subchannel_ind(irq_ptr, 1); |
| 296 | put_indicator(irq_ptr->dsci); | ||
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | void __exit tiqdio_unregister_thinints(void) | 299 | void __exit tiqdio_unregister_thinints(void) |