Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 63395
b: refs/heads/master
c: 09c7d82
h: refs/heads/master
i:
  63393: 42cdd5c
  63391: f0a38c9
v: v3
  • Loading branch information
Marcel Holtmann authored and David S. Miller committed Jul 31, 2007
1 parent f5a3983 commit 2b97daf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 566cfd8f0e049a0647f94714f913e2a975dc464f
refs/heads/master: 09c7d8293a2d1317d16ef4ddb9f6dd2553d0694e
5 changes: 3 additions & 2 deletions trunk/net/bluetooth/rfcomm/tty.c
Original file line number Diff line number Diff line change
Expand Up @@ -267,17 +267,18 @@ static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
out:
write_unlock_bh(&rfcomm_dev_lock);

if (err) {
if (err < 0) {
kfree(dev);
return err;
}

dev->tty_dev = tty_register_device(rfcomm_tty_driver, dev->id, NULL);

if (IS_ERR(dev->tty_dev)) {
err = PTR_ERR(dev->tty_dev);
list_del(&dev->list);
kfree(dev);
return PTR_ERR(dev->tty_dev);
return err;
}

return dev->id;
Expand Down

0 comments on commit 2b97daf

Please sign in to comment.