From e9a8573afa5bc7af2a9e062f0292ee4ae281bd5b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 27 Oct 2014 04:04:04 +0100
Subject: [PATCH] Misc. minor cleanups

---
 camera/android.c      | 3 ++-
 camera/video4linux2.c | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/camera/android.c b/camera/android.c
index bb300fa9cf..b048c80782 100644
--- a/camera/android.c
+++ b/camera/android.c
@@ -93,7 +93,8 @@ static void *android_camera_init(const char *device, uint64_t caps,
 
    return androidcamera;
 dealloc:
-   free(androidcamera);
+   if (androidcamera)
+      free(androidcamera);
    return NULL;
 }
 
diff --git a/camera/video4linux2.c b/camera/video4linux2.c
index 6736939f6c..0c2df0a2c9 100644
--- a/camera/video4linux2.c
+++ b/camera/video4linux2.c
@@ -20,8 +20,6 @@
 #include <string.h>
 #include <assert.h>
 #include <stddef.h>
-#include "../general.h"
-#include "../driver.h"
 #include "../performance.h"
 #include <retro_miscellaneous.h>
 #include <gfx/scaler/scaler.h>