From 048d951646d2bdcf5f61200f0bc73b639798e4b8 Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Thu, 25 Dec 2008 13:39:05 +0100 Subject: [PATCH] --- yaml --- r: 121387 b: refs/heads/master c: 97166f52fc84c0bc49c7dbba2a26720110acb458 h: refs/heads/master i: 121385: 034e7228cdfba1b34f233b068c07e3ed7bf5ed0d 121383: e8d1d1eafce16137caf5aa39a30947727a8bbce9 v: v3 --- [refs] | 2 +- trunk/drivers/s390/cio/device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4ebb184a8da4..34dd8402240e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c619d4223eaa063dd15ce44235b04487235f8cb7 +refs/heads/master: 97166f52fc84c0bc49c7dbba2a26720110acb458 diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c index fc0c0abd1271..647cbaca298e 100644 --- a/trunk/drivers/s390/cio/device.c +++ b/trunk/drivers/s390/cio/device.c @@ -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);