diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/bluetooth/btmrvl_main.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/bluetooth/btmrvl_main.c')
| -rw-r--r-- | drivers/bluetooth/btmrvl_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c index 0d32ec82e9bf..548d1d9e4dda 100644 --- a/drivers/bluetooth/btmrvl_main.c +++ b/drivers/bluetooth/btmrvl_main.c | |||
| @@ -117,8 +117,8 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb) | |||
| 117 | (event->data[2] == MODULE_ALREADY_UP)) ? | 117 | (event->data[2] == MODULE_ALREADY_UP)) ? |
| 118 | "Bring-up succeed" : "Bring-up failed"); | 118 | "Bring-up succeed" : "Bring-up failed"); |
| 119 | 119 | ||
| 120 | if (event->length > 3) | 120 | if (event->length > 3 && event->data[3]) |
| 121 | priv->btmrvl_dev.dev_type = event->data[3]; | 121 | priv->btmrvl_dev.dev_type = HCI_AMP; |
| 122 | else | 122 | else |
| 123 | priv->btmrvl_dev.dev_type = HCI_BREDR; | 123 | priv->btmrvl_dev.dev_type = HCI_BREDR; |
| 124 | 124 | ||