/* Bluetooth SCO sockets. */
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
static struct sco_conn *sco_conn_add(struct hci_conn *hcon, __u8 status)
{
struct hci_dev *hdev = hcon->hdev;
- struct sco_conn *conn = hcon->sco_data;
+ struct sco_conn *conn;
- if (conn || status)
+ if ((conn = hcon->sco_data))
return conn;
- conn = kzalloc(sizeof(struct sco_conn), GFP_ATOMIC);
- if (!conn)
+ if (status)
+ return conn;
+
+ if (!(conn = kmalloc(sizeof(struct sco_conn), GFP_ATOMIC)))
return NULL;
+ memset(conn, 0, sizeof(struct sco_conn));
spin_lock_init(&conn->lock);
conn->mtu = 60;
BT_DBG("hcon %p conn %p", hcon, conn);
-
return conn;
}
}
if ((err = hci_send_sco(conn->hcon, skb)) < 0)
- return err;
+ goto fail;
return count;
goto error;
}
- class_create_file(bt_class, &class_attr_sco);
+ class_create_file(&bt_class, &class_attr_sco);
BT_INFO("SCO (Voice Link) ver %s", VERSION);
BT_INFO("SCO socket layer initialized");
static void __exit sco_exit(void)
{
- class_remove_file(bt_class, &class_attr_sco);
+ class_remove_file(&bt_class, &class_attr_sco);
if (bt_sock_unregister(BTPROTO_SCO) < 0)
BT_ERR("SCO socket unregistration failed");