GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-03-28 18:05:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bluetooth: Refactor rfcomm_dev_add()

Browse source 
Move rfcomm_dev allocation and initialization into new function,
__rfcomm_dev_add(), to simplify resource release in error handling.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Tested-By: Alexander Holler <holler@ahsoftware.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Peter Hurley 2014-02-09 20:59:19 -05:00 • committed by Marcel Holtmann
parent 033ace99c4
commit f355095756
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
net/bluetooth/rfcomm/tty.c
View file

@ -208,17 +208,16 @@ static ssize_t show_channel(struct device *tty_dev, struct device_attribute *att
static DEVICE_ATTR(address, S_IRUGO, show_address, NULL); static DEVICE_ATTR(address, S_IRUGO, show_address, NULL);
static DEVICE_ATTR(channel, S_IRUGO, show_channel, NULL); static DEVICE_ATTR(channel, S_IRUGO, show_channel, NULL);
static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc) static struct rfcomm_dev *__rfcomm_dev_add(struct rfcomm_dev_req *req,
struct rfcomm_dlc *dlc)
{ {
struct rfcomm_dev *dev, *entry; struct rfcomm_dev *dev, *entry;
struct list_head *head = &rfcomm_dev_list; struct list_head *head = &rfcomm_dev_list;
int err = 0; int err = 0;
BT_DBG("id %d channel %d", req->dev_id, req->channel);
dev = kzalloc(sizeof(struct rfcomm_dev), GFP_KERNEL); dev = kzalloc(sizeof(struct rfcomm_dev), GFP_KERNEL);
if (!dev) if (!dev)
return -ENOMEM; return ERR_PTR(-ENOMEM);
spin_lock(&rfcomm_dev_lock); spin_lock(&rfcomm_dev_lock);
@ -301,22 +300,37 @@ static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
holds reference to this module. */ holds reference to this module. */
__module_get(THIS_MODULE); __module_get(THIS_MODULE);
spin_unlock(&rfcomm_dev_lock);
return dev;
out: out:
spin_unlock(&rfcomm_dev_lock); spin_unlock(&rfcomm_dev_lock);
kfree(dev);
return ERR_PTR(err);
}
if (err < 0) static int rfcomm_dev_add(struct rfcomm_dev_req *req, struct rfcomm_dlc *dlc)
goto free; {
struct rfcomm_dev *dev;
struct device *tty;
dev->tty_dev = tty_port_register_device(&dev->port, rfcomm_tty_driver, BT_DBG("id %d channel %d", req->dev_id, req->channel);
dev = __rfcomm_dev_add(req, dlc);
if (IS_ERR(dev))
return PTR_ERR(dev);
tty = tty_port_register_device(&dev->port, rfcomm_tty_driver,
dev->id, NULL); dev->id, NULL);
if (IS_ERR(dev->tty_dev)) { if (IS_ERR(tty)) {
err = PTR_ERR(dev->tty_dev);
spin_lock(&rfcomm_dev_lock); spin_lock(&rfcomm_dev_lock);
list_del(&dev->list); list_del(&dev->list);
spin_unlock(&rfcomm_dev_lock); spin_unlock(&rfcomm_dev_lock);
goto free; kfree(dev);
return PTR_ERR(tty);
} }
dev->tty_dev = tty;
rfcomm_reparent_device(dev); rfcomm_reparent_device(dev);
dev_set_drvdata(dev->tty_dev, dev); dev_set_drvdata(dev->tty_dev, dev);
@ -327,10 +341,6 @@ out:
BT_ERR("Failed to create channel attribute"); BT_ERR("Failed to create channel attribute");
return dev->id; return dev->id;
free:
kfree(dev);
return err;
} }
/* ---- Send buffer ---- */ /* ---- Send buffer ---- */