Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5183
b: refs/heads/master
c: c63307f
h: refs/heads/master
i:
  5181: d9600f5
  5179: 4b69546
  5175: 5a99779
  5167: 164c9e7
  5151: 09b09bb
  5119: 836927c
v: v3
  • Loading branch information
Cornelia Huck authored and Linus Torvalds committed Jul 27, 2005
1 parent 3964ade commit 17ed832
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1d3ac7aadbccd8456fdca09394ddb570b95fe7dc
refs/heads/master: c63307f164a79e0ff6dd2da33436c59b3d3396cd
10 changes: 3 additions & 7 deletions trunk/drivers/s390/cio/chsc.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* drivers/s390/cio/chsc.c
* S/390 common I/O routines -- channel subsystem call
* $Revision: 1.119 $
* $Revision: 1.120 $
*
* Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
* IBM Corporation
Expand Down Expand Up @@ -412,11 +412,7 @@ s390_process_res_acc (u8 chpid, __u16 fla, u32 fla_mask)
if (chp_mask == 0) {

spin_unlock_irq(&sch->lock);

if (fla_mask != 0)
break;
else
continue;
continue;
}
old_lpm = sch->lpm;
sch->lpm = ((sch->schib.pmcw.pim &
Expand All @@ -430,7 +426,7 @@ s390_process_res_acc (u8 chpid, __u16 fla, u32 fla_mask)

spin_unlock_irq(&sch->lock);
put_device(&sch->dev);
if (fla_mask != 0)
if (fla_mask == 0xffff)
break;
}
return rc;
Expand Down

0 comments on commit 17ed832

Please sign in to comment.