From 5ce207720f70502ded8ef6628d73ca1d3b536884 Mon Sep 17 00:00:00 2001 From: Edgardo Hames Date: Mon, 15 Mar 2010 23:00:40 -0300 Subject: [PATCH] --- yaml --- r: 197083 b: refs/heads/master c: 4ffab688827361bcdaca6ac83bbda195c53bd098 h: refs/heads/master i: 197081: d07faf9523a0618252db5735173b637004fd6051 197079: ba3c7be573467d6ededd4ccf9d6abdc471a7dc03 v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlan-ng/hfa384x_usb.c | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 73f815911ae9..7b9bd4bcf749 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5813b6243cf02b89c6e6a6a8debc10477e5ce3a8 +refs/heads/master: 4ffab688827361bcdaca6ac83bbda195c53bd098 diff --git a/trunk/drivers/staging/wlan-ng/hfa384x_usb.c b/trunk/drivers/staging/wlan-ng/hfa384x_usb.c index 2400242e2d87..a41db5dc8c7c 100644 --- a/trunk/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/trunk/drivers/staging/wlan-ng/hfa384x_usb.c @@ -2612,19 +2612,18 @@ int hfa384x_drvr_start(hfa384x_t *hw) if (result1 != 0) { if (result2 != 0) { printk(KERN_ERR - "cmd_initialize() failed on two attempts," - " results %d and %d\n", result1, result2); + "cmd_initialize() failed on two attempts, results %d and %d\n", + result1, result2); usb_kill_urb(&hw->rx_urb); goto done; } else { pr_debug("First cmd_initialize() failed (result %d),\n", result1); - pr_debug("but second attempt succeeded." - " All should be ok\n"); + pr_debug("but second attempt succeeded. All should be ok\n"); } } else if (result2 != 0) { - printk(KERN_WARNING "First cmd_initialize() succeeded," - " but second attempt failed (result=%d)\n", result2); + printk(KERN_WARNING "First cmd_initialize() succeeded, but second attempt failed (result=%d)\n", + result2); printk(KERN_WARNING "Most likely the card will be functional\n"); goto done; @@ -3382,9 +3381,7 @@ static void hfa384x_usbin_ctlx(hfa384x_t *hw, hfa384x_usbin_t *usbin, * our request has been acknowledged. Odd, * but our OUT URB is still alive... */ - pr_debug("Causality violation: " - "please reboot Universe, or email " - "linux-wlan-devel@lists.linux-wlan.com\n"); + pr_debug("Causality violation: please reboot Universe\n"); ctlx->state = CTLX_RESP_COMPLETE; break; @@ -3848,8 +3845,8 @@ static void hfa384x_ctlxout_callback(struct urb *urb) default: /* This is NOT a valid CTLX "success" state! */ - printk(KERN_ERR "Illegal CTLX[%d]" - " success state(%s, %d) in OUT URB\n", + printk(KERN_ERR + "Illegal CTLX[%d] success state(%s, %d) in OUT URB\n", le16_to_cpu(ctlx->outbuf.type), ctlxstr(ctlx->state), urb->status); break;