diff options
| author | Greg Kroah-Hartman | 2014-09-15 07:17:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-09-15 07:17:40 +0200 |
| commit | 882ebfc28c389be86535bda4a7d9e407020356bf (patch) | |
| tree | e8f3ddeda13196f40040f3ba4701ece5d38c63cc /drivers/uwb | |
| parent | mips/uapi: Add definition of TIOC[SG]RS485 (diff) | |
| parent | Linux 3.17-rc5 (diff) | |
| download | kernel-qcow2-linux-882ebfc28c389be86535bda4a7d9e407020356bf.tar.gz kernel-qcow2-linux-882ebfc28c389be86535bda4a7d9e407020356bf.tar.xz kernel-qcow2-linux-882ebfc28c389be86535bda4a7d9e407020356bf.zip | |
Merge 3.17-rc5 into tty-next
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/uwb')
| -rw-r--r-- | drivers/uwb/lc-dev.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/uwb/lc-dev.c b/drivers/uwb/lc-dev.c index 80079b8fed15..d0303f0dbe15 100644 --- a/drivers/uwb/lc-dev.c +++ b/drivers/uwb/lc-dev.c @@ -431,16 +431,19 @@ void uwbd_dev_onair(struct uwb_rc *rc, struct uwb_beca_e *bce) uwb_dev->mac_addr = *bce->mac_addr; uwb_dev->dev_addr = bce->dev_addr; dev_set_name(&uwb_dev->dev, "%s", macbuf); + + /* plug the beacon cache */ + bce->uwb_dev = uwb_dev; + uwb_dev->bce = bce; + uwb_bce_get(bce); /* released in uwb_dev_sys_release() */ + result = uwb_dev_add(uwb_dev, &rc->uwb_dev.dev, rc); if (result < 0) { dev_err(dev, "new device %s: cannot instantiate device\n", macbuf); goto error_dev_add; } - /* plug the beacon cache */ - bce->uwb_dev = uwb_dev; - uwb_dev->bce = bce; - uwb_bce_get(bce); /* released in uwb_dev_sys_release() */ + dev_info(dev, "uwb device (mac %s dev %s) connected to %s %s\n", macbuf, devbuf, rc->uwb_dev.dev.parent->bus->name, dev_name(rc->uwb_dev.dev.parent)); @@ -448,6 +451,8 @@ void uwbd_dev_onair(struct uwb_rc *rc, struct uwb_beca_e *bce) return; error_dev_add: + bce->uwb_dev = NULL; + uwb_bce_put(bce); kfree(uwb_dev); return; } |