aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-27 07:26:48 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-27 07:26:48 +0900
commitb76a1e4f2a2f95354f4567c8eb420fd4cb68fc26 (patch)
tree3231168f2e67d8351e8b9bf4161d9df89251f5fd /drivers
parent78daa87b1d332e4ac963c793a4157533d57501c7 (diff)
parent4814a2b3c603438ed8c330c74b49aa662b1ede43 (diff)
downloadmrst-s0i3-test-b76a1e4f2a2f95354f4567c8eb420fd4cb68fc26.tar.gz
mrst-s0i3-test-b76a1e4f2a2f95354f4567c8eb420fd4cb68fc26.tar.xz
mrst-s0i3-test-b76a1e4f2a2f95354f4567c8eb420fd4cb68fc26.zip
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c
index 752dbee06af..5d9c66627b6 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)
return;
/* reset adapter interrupt indicators */
- put_indicator(irq_ptr->dsci);
set_subchannel_ind(irq_ptr, 1);
+ put_indicator(irq_ptr->dsci);
}
void __exit tiqdio_unregister_thinints(void)