From a6d23fc7db79edbdb2de78e78d2e8e345536b280 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Mon, 18 Jun 2007 18:46:49 +0200 Subject: [PATCH] --- yaml --- r: 58449 b: refs/heads/master c: 79352e9f94cff4078f2ffefac4a41b7f14046fb6 h: refs/heads/master i: 58447: 05e7c0f6a9680a4b75b04fa8488c8e4effb4f91f v: v3 --- [refs] | 2 +- trunk/drivers/firewire/fw-sbp2.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1c1d7d86e937..0bbc77fcdf89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf47c7a26ca13b944900dce208890c5b6d5f3a14 +refs/heads/master: 79352e9f94cff4078f2ffefac4a41b7f14046fb6 diff --git a/trunk/drivers/firewire/fw-sbp2.c b/trunk/drivers/firewire/fw-sbp2.c index 49f7fd52ae87..846aad8666f5 100644 --- a/trunk/drivers/firewire/fw-sbp2.c +++ b/trunk/drivers/firewire/fw-sbp2.c @@ -520,17 +520,15 @@ static int sbp2_agent_reset(struct fw_unit *unit) static void sbp2_reconnect(struct work_struct *work); static struct scsi_host_template scsi_driver_template; -static void -release_sbp2_device(struct kref *kref) +static void release_sbp2_device(struct kref *kref) { struct sbp2_device *sd = container_of(kref, struct sbp2_device, kref); struct Scsi_Host *host = container_of((void *)sd, struct Scsi_Host, hostdata[0]); + scsi_remove_host(host); sbp2_send_management_orb(sd->unit, sd->node_id, sd->generation, SBP2_LOGOUT_REQUEST, sd->login_id, NULL); - - scsi_remove_host(host); fw_core_remove_address_handler(&sd->address_handler); fw_notify("removed sbp2 unit %s\n", sd->unit->device.bus_id); put_device(&sd->unit->device);