-From 55c9d1a762b9cbb5a4c574918fb41a9cde6bb491 Mon Sep 17 00:00:00 2001
+From 1508167e99ee5e5ee81030c4923aeafae48a6940 Mon Sep 17 00:00:00 2001
From: Stefan Wahren <stefan.wahren@i2se.com>
Date: Mon, 22 Oct 2018 11:09:18 +0200
-Subject: [PATCH 237/703] staging: bcm2835: Don't probe if no camera is
+Subject: [PATCH 237/773] staging: bcm2835: Don't probe if no camera is
detected
It is a waste of resources to load the camera driver in case there isn't
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-@@ -1847,6 +1847,12 @@ static int bcm2835_mmal_probe(struct pla
+@@ -1860,6 +1860,12 @@ static int bcm2835_mmal_probe(struct pla
num_cameras = get_num_cameras(instance,
resolutions,
MAX_BCM2835_CAMERAS);
if (num_cameras > MAX_BCM2835_CAMERAS)
num_cameras = MAX_BCM2835_CAMERAS;
-@@ -1955,6 +1961,9 @@ cleanup_gdev:
+@@ -1968,6 +1974,9 @@ cleanup_gdev:
gdev[i] = NULL;
}