Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 121387
b: refs/heads/master
c: 97166f5
h: refs/heads/master
i:
  121385: 034e722
  121383: e8d1d1e
v: v3
  • Loading branch information
Cornelia Huck authored and Martin Schwidefsky committed Dec 25, 2008
1 parent c1aa11a commit 048d951
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: c619d4223eaa063dd15ce44235b04487235f8cb7
refs/heads/master: 97166f52fc84c0bc49c7dbba2a26720110acb458
4 changes: 2 additions & 2 deletions trunk/drivers/s390/cio/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -875,14 +875,14 @@ void ccw_device_move_to_orphanage(struct work_struct *work)
if (replacing_cdev) {
sch_attach_disconnected_device(sch, replacing_cdev);
/* Release reference from get_disc_ccwdev_by_dev_id() */
put_device(&cdev->dev);
put_device(&replacing_cdev->dev);
return;
}
replacing_cdev = get_orphaned_ccwdev_by_dev_id(css, &dev_id);
if (replacing_cdev) {
sch_attach_orphaned_device(sch, replacing_cdev);
/* Release reference from get_orphaned_ccwdev_by_dev_id() */
put_device(&cdev->dev);
put_device(&replacing_cdev->dev);
return;
}
sch_create_and_recog_new_device(sch);
Expand Down

0 comments on commit 048d951

Please sign in to comment.