diff options
| author | Adrian Nicoara | 2014-09-08 20:39:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-09-08 22:26:33 +0200 |
| commit | ce6880e17508b31e04628a71d4691ef4a00a8b3f (patch) | |
| tree | 6d0aeaa2d6c228f1124154f4d3a9fdb47c473874 /drivers/staging/ozwpan/ozproto.c | |
| parent | staging: unisys: uislib: uislib.c: sparse warning of context imbalance (diff) | |
| download | kernel-qcow2-linux-ce6880e17508b31e04628a71d4691ef4a00a8b3f.tar.gz kernel-qcow2-linux-ce6880e17508b31e04628a71d4691ef4a00a8b3f.tar.xz kernel-qcow2-linux-ce6880e17508b31e04628a71d4691ef4a00a8b3f.zip | |
staging: ozwpan: fix missing blank line after declaration
Cleanup checkpatch.pl warnings.
Signed-off-by: Adrian Nicoara <anicoara@uwaterloo.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/ozwpan/ozproto.c')
| -rw-r--r-- | drivers/staging/ozwpan/ozproto.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/ozwpan/ozproto.c b/drivers/staging/ozwpan/ozproto.c index af3da3ebabc2..cae0e6f5ae68 100644 --- a/drivers/staging/ozwpan/ozproto.c +++ b/drivers/staging/ozwpan/ozproto.c @@ -179,6 +179,7 @@ static struct oz_pd *oz_connect_req(struct oz_pd *cur_pd, struct oz_elt *elt, } else { struct oz_pd *pd2 = NULL; struct list_head *e; + pd = oz_pd_alloc(pd_addr); if (pd == NULL) return NULL; @@ -262,6 +263,7 @@ done: u16 start_apps = new_apps & ~pd->total_apps & ~0x1; u16 stop_apps = pd->total_apps & ~new_apps & ~0x1; u16 resume_apps = new_apps & pd->paused_apps & ~0x1; + spin_unlock_bh(&g_polling_lock); oz_pd_set_state(pd, OZ_PD_S_CONNECTED); oz_dbg(ON, "new_apps=0x%x total_apps=0x%x paused_apps=0x%x\n", @@ -383,6 +385,7 @@ static void oz_rx_frame(struct sk_buff *skb) if ((oz_hdr->control & OZ_F_ACK_REQUESTED) && (pd->state == OZ_PD_S_CONNECTED)) { int backlog = pd->nb_queued_frames; + pd->trigger_pkt_num = pkt_num; /* Send queued frames */ oz_send_queued_frames(pd, backlog); @@ -781,6 +784,7 @@ int oz_protocol_init(char *devs) oz_binding_add(NULL); } else { char d[32]; + while (*devs) { devs = oz_get_next_device_name(devs, d, sizeof(d)); if (d[0]) |