diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-26 17:26:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-26 17:26:48 -0500 |
| commit | b76a1e4f2a2f95354f4567c8eb420fd4cb68fc26 (patch) | |
| tree | 3231168f2e67d8351e8b9bf4161d9df89251f5fd /drivers | |
| parent | 78daa87b1d332e4ac963c793a4157533d57501c7 (diff) | |
| parent | 4814a2b3c603438ed8c330c74b49aa662b1ede43 (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] qdio: free indicator after reset is finished
[S390] nmi: fix clock comparator revalidation
Diffstat (limited to 'drivers')
| -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) |