From 9e559f563f2a6ff9b0bf132f70e905ba390cd8af Mon Sep 17 00:00:00 2001 From: Peter Hurley Date: Mon, 28 Jan 2013 22:34:36 -0500 Subject: [PATCH] --- yaml --- r: 354282 b: refs/heads/master c: c88d40b25ffc8099aa7a28f62dce85bee66b1892 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/fwserial/fwserial.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5bacabb27ef6..79413e196b7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de321a14da65a534da89a80dde949d0c6ff6316f +refs/heads/master: c88d40b25ffc8099aa7a28f62dce85bee66b1892 diff --git a/trunk/drivers/staging/fwserial/fwserial.c b/trunk/drivers/staging/fwserial/fwserial.c index 8db4b41d4f43..e40b480d4dc2 100644 --- a/trunk/drivers/staging/fwserial/fwserial.c +++ b/trunk/drivers/staging/fwserial/fwserial.c @@ -2684,10 +2684,9 @@ static void fwserial_handle_unplug_req(struct work_struct *work) spin_lock_bh(&peer->lock); if (peer->state == FWPS_UNPLUG_RESPONDING) { - if (rcode == RCODE_COMPLETE) - port = peer_revert_state(peer); - else + if (rcode != RCODE_COMPLETE) fwtty_err(&peer->unit, "UNPLUG_RSP error (%d)", rcode); + port = peer_revert_state(peer); } cleanup: spin_unlock_bh(&peer->lock);