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 'for-linus' of git://git.alsa-project.org/alsa-kernel
[pandora-kernel.git]
/
drivers
/
s390
/
cio
/
qdio.c
diff --git
a/drivers/s390/cio/qdio.c
b/drivers/s390/cio/qdio.c
index
f9be265
..
2bf36e1
100644
(file)
--- a/
drivers/s390/cio/qdio.c
+++ b/
drivers/s390/cio/qdio.c
@@
-3713,7
+3713,8
@@
tiqdio_register_thinints(void)
char dbf_text[20];
tiqdio_ind =
char dbf_text[20];
tiqdio_ind =
- s390_register_adapter_interrupt(&tiqdio_thinint_handler, NULL);
+ s390_register_adapter_interrupt(&tiqdio_thinint_handler, NULL,
+ TIQDIO_THININT_ISC);
if (IS_ERR(tiqdio_ind)) {
sprintf(dbf_text, "regthn%lx", PTR_ERR(tiqdio_ind));
QDIO_DBF_TEXT0(0,setup,dbf_text);
if (IS_ERR(tiqdio_ind)) {
sprintf(dbf_text, "regthn%lx", PTR_ERR(tiqdio_ind));
QDIO_DBF_TEXT0(0,setup,dbf_text);
@@
-3729,7
+3730,8
@@
static void
tiqdio_unregister_thinints(void)
{
if (tiqdio_ind)
tiqdio_unregister_thinints(void)
{
if (tiqdio_ind)
- s390_unregister_adapter_interrupt(tiqdio_ind);
+ s390_unregister_adapter_interrupt(tiqdio_ind,
+ TIQDIO_THININT_ISC);
}
static int
}
static int
@@
-3890,6
+3892,7
@@
init_QDIO(void)
qdio_mempool_alloc,
qdio_mempool_free, NULL);
qdio_mempool_alloc,
qdio_mempool_free, NULL);
+ isc_register(QDIO_AIRQ_ISC);
if (tiqdio_check_chsc_availability())
QDIO_PRINT_ERR("Not all CHSCs supported. Continuing.\n");
if (tiqdio_check_chsc_availability())
QDIO_PRINT_ERR("Not all CHSCs supported. Continuing.\n");
@@
-3902,6
+3905,7
@@
static void __exit
cleanup_QDIO(void)
{
tiqdio_unregister_thinints();
cleanup_QDIO(void)
{
tiqdio_unregister_thinints();
+ isc_unregister(QDIO_AIRQ_ISC);
qdio_remove_procfs_entry();
qdio_release_qdio_memory();
qdio_unregister_dbf_views();
qdio_remove_procfs_entry();
qdio_release_qdio_memory();
qdio_unregister_dbf_views();