Commit 653a07b222f76c832625cccbb1a097dde3048422
1 parent
5be8e1f2
Change freeing method because the allocation function was changed in r5532
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5536 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
3 additions
and
3 deletions
hw/bt-hci.c
| @@ -1135,7 +1135,7 @@ void bt_hci_reset(struct bt_hci_s *hci) | @@ -1135,7 +1135,7 @@ void bt_hci_reset(struct bt_hci_s *hci) | ||
| 1135 | hci->device.inquiry_scan = 0; | 1135 | hci->device.inquiry_scan = 0; |
| 1136 | hci->device.page_scan = 0; | 1136 | hci->device.page_scan = 0; |
| 1137 | if (hci->device.lmp_name) | 1137 | if (hci->device.lmp_name) |
| 1138 | - free((void *) hci->device.lmp_name); | 1138 | + qemu_free((void *) hci->device.lmp_name); |
| 1139 | hci->device.lmp_name = 0; | 1139 | hci->device.lmp_name = 0; |
| 1140 | hci->device.class[0] = 0x00; | 1140 | hci->device.class[0] = 0x00; |
| 1141 | hci->device.class[1] = 0x00; | 1141 | hci->device.class[1] = 0x00; |
| @@ -1813,7 +1813,7 @@ static void bt_submit_hci(struct HCIInfo *info, | @@ -1813,7 +1813,7 @@ static void bt_submit_hci(struct HCIInfo *info, | ||
| 1813 | LENGTH_CHECK(change_local_name); | 1813 | LENGTH_CHECK(change_local_name); |
| 1814 | 1814 | ||
| 1815 | if (hci->device.lmp_name) | 1815 | if (hci->device.lmp_name) |
| 1816 | - free((void *) hci->device.lmp_name); | 1816 | + qemu_free((void *) hci->device.lmp_name); |
| 1817 | hci->device.lmp_name = pstrdup(PARAM(change_local_name, name), | 1817 | hci->device.lmp_name = pstrdup(PARAM(change_local_name, name), |
| 1818 | sizeof(PARAM(change_local_name, name))); | 1818 | sizeof(PARAM(change_local_name, name))); |
| 1819 | bt_hci_event_complete_status(hci, HCI_SUCCESS); | 1819 | bt_hci_event_complete_status(hci, HCI_SUCCESS); |
| @@ -2189,7 +2189,7 @@ static void bt_hci_done(struct HCIInfo *info) | @@ -2189,7 +2189,7 @@ static void bt_hci_done(struct HCIInfo *info) | ||
| 2189 | bt_device_done(&hci->device); | 2189 | bt_device_done(&hci->device); |
| 2190 | 2190 | ||
| 2191 | if (hci->device.lmp_name) | 2191 | if (hci->device.lmp_name) |
| 2192 | - free((void *) hci->device.lmp_name); | 2192 | + qemu_free((void *) hci->device.lmp_name); |
| 2193 | 2193 | ||
| 2194 | /* Be gentle and send DISCONNECT to all connected peers and those | 2194 | /* Be gentle and send DISCONNECT to all connected peers and those |
| 2195 | * currently waiting for us to accept or reject a connection request. | 2195 | * currently waiting for us to accept or reject a connection request. |