Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4704fe65 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 regression fix from Martin Schwidefsky:
 "It is a fix for a regression that has been introduced with git commit
  25f269f1 - "[S390] qdio: EQBS retry after CCQ 96" - and if possible
  we would like to have working code for the fcp data router in 3.3."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  [S390] qdio: fix handler function arguments for zfcp data router
parents 1de9d143 7b3cc67d

drivers/s390/cio/qdio_main.c

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int qdio_do_eqbs(struct qdio_q *q, unsigned char *state, 
	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 @@ static int qdio_do_sqbs(struct qdio_q *q, unsigned char state, int start, 
	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;

}