From 4f2d3321ab320d412cd726556e446d09c59bea1a Mon Sep 17 00:00:00 2001 From: Joe Eykholt Date: Tue, 25 Aug 2009 14:01:39 -0700 Subject: [PATCH] --- yaml --- r: 161147 b: refs/heads/master c: cdbe6dfece038e75214735d56cd06319b9a6df46 h: refs/heads/master i: 161145: 28b9bd48414d0994f6993ccbdfdc5e86b6f32c9e 161143: aa8382830d9d6563b2dfd27fa0197507334ca639 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libfc/fc_rport.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 566daac2c810..8b8408074ab4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b84c7962653e4d04065d2603f0e1424ee0f455ae +refs/heads/master: cdbe6dfece038e75214735d56cd06319b9a6df46 diff --git a/trunk/drivers/scsi/libfc/fc_rport.c b/trunk/drivers/scsi/libfc/fc_rport.c index cbf6c9f233ca..6ecf36d4708c 100644 --- a/trunk/drivers/scsi/libfc/fc_rport.c +++ b/trunk/drivers/scsi/libfc/fc_rport.c @@ -436,7 +436,8 @@ static void fc_rport_timeout(struct work_struct *work) static void fc_rport_error(struct fc_rport_priv *rdata, struct fc_frame *fp) { FC_RPORT_DBG(rdata, "Error %ld in state %s, retries %d\n", - PTR_ERR(fp), fc_rport_state(rdata), rdata->retries); + IS_ERR(fp) ? -PTR_ERR(fp) : 0, + fc_rport_state(rdata), rdata->retries); switch (rdata->rp_state) { case RPORT_ST_PLOGI: