From 82548dbeaf3779415ee8e4fed94485e94a29b97e Mon Sep 17 00:00:00 2001 From: Joe Eykholt Date: Wed, 29 Jul 2009 17:04:54 -0700 Subject: [PATCH] --- yaml --- r: 161023 b: refs/heads/master c: 201e5795b7b9582accb6d83316e30f24d7d40fd3 h: refs/heads/master i: 161021: b7b2776d903798ac9a92729bce09cd9a63006d6e 161019: 3f51f50779c17cbd4b9b361fe5b10dd8b23f682d 161015: 8985fd535445eee66de6cc0a6637e4eebd2ce56d 161007: 8029392ba0072ebc311fb87cb9c4ac12d4016e1d 160991: 291081f296bad97f3bdfeb81a8b8591862bf83b7 160959: c5e90e5b3695bcbaafa67d37cd8171f0658f373c 160895: 3ce3076b8d69fcc2d50be735cff61fb3bcd09b10 160767: 9b0fc5d13e2eecee62823facc660dd890f28510c v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libfc/fc_rport.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0f65d5caa670..23a79b979d44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f7ea3b7f81d5e5180647a071998b73a841bdba9 +refs/heads/master: 201e5795b7b9582accb6d83316e30f24d7d40fd3 diff --git a/trunk/drivers/scsi/libfc/fc_rport.c b/trunk/drivers/scsi/libfc/fc_rport.c index a86df0b41ae3..90cc90dd3b5d 100644 --- a/trunk/drivers/scsi/libfc/fc_rport.c +++ b/trunk/drivers/scsi/libfc/fc_rport.c @@ -276,6 +276,7 @@ static void fc_rport_work(struct work_struct *work) mutex_unlock(&rdata->rp_mutex); if (rport_ops->event_callback) rport_ops->event_callback(lport, rport, event); + cancel_delayed_work_sync(&rdata->retry_work); if (trans_state == FC_PORTSTATE_ROGUE) put_device(&rport->dev); else { @@ -433,7 +434,6 @@ static void fc_rport_timeout(struct work_struct *work) } mutex_unlock(&rdata->rp_mutex); - put_device(&rport->dev); } /** @@ -494,7 +494,6 @@ static void fc_rport_error_retry(struct fc_rport *rport, struct fc_frame *fp) /* no additional delay on exchange timeouts */ if (PTR_ERR(fp) == -FC_EX_TIMEOUT) delay = 0; - get_device(&rport->dev); schedule_delayed_work(&rdata->retry_work, delay); return; }