qemu-common: stop including qemu/bswap.h from qemu-common.h

[qemu.git] / hw / bt / l2cap.c

diff --git a/hw/bt/l2cap.c b/hw/bt/l2cap.c
index 2301d6f87fd82f4d5ca86449f9d591d79c5db725..dfc95ed0487928ef00c1e36341c48755f84cb6b5 100644 (file)
--- a/hw/bt/l2cap.c
+++ b/hw/bt/l2cap.c
@@ -17,8 +17,10 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
+#include "qemu/bswap.h"
 #include "hw/bt.h"
 
 #define L2CAP_CID_MAX  0x100   /* Between 0x40 and 0x10000 */
@@ -429,7 +431,7 @@ static struct l2cap_chan_s *l2cap_channel_open(struct l2cap_instance_s *l2cap,
                 status = L2CAP_CS_NO_INFO;
             } else {
                 g_free(ch);
-
+                ch = NULL;
                 result = L2CAP_CR_NO_MEM;
                 status = L2CAP_CS_NO_INFO;
             }