Skip to contentSkip to conversation

s390 regression fix for 3.3-rc6

GIT PULL Martin Schwidefsky 1 participant 1 message Mar 6, 2012

Subsystems (2)
s390 s390 common I/O layer
lore
Share & tools
lore

Martin Schwidefsky

author
#0 lore raw

Hi Linus,

please pull from 'for-linus' branch of

git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus

to receive the following updates:

Steffen Maier (1):
[S390] qdio: fix handler function arguments for zfcp data router

It is a fix for a regression that has been introduced with git commit 25f269f17316549e and if possible we would like to have working code for the fcp data router in 3.3.

 drivers/s390/cio/qdio_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/s390/cio/qdio_main.c +2 -2
index 3ef8d07..770a740 100644
@@ -167,7 +167,7 @@ again:
 	DBF_ERROR("%4x EQBS ERROR", SCH_NO(q));
 	DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
 	q->handler(q->irq_ptr->cdev, QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
-		   0, -1, -1, q->irq_ptr->int_parm);
+		   q->nr, q->first_to_kick, count, q->irq_ptr->int_parm);
 	return 0;
 }
 

@@ -215,7 +215,7 @@ again:
 	DBF_ERROR("%4x SQBS ERROR", SCH_NO(q));
 	DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
 	q->handler(q->irq_ptr->cdev, QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
-		   0, -1, -1, q->irq_ptr->int_parm);
+		   q->nr, q->first_to_kick, count, q->irq_ptr->int_parm);
 	return 0;
 }