summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.4/0363-bcm2835-camera-Fix-max-min-error-when-looping-over-c.patch
blob: df6fd7e3bdbf3a36d8c0c4b425033bba8bae90a1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
From bc431816b3277e61807a3c279ae8fe11b1599f67 Mon Sep 17 00:00:00 2001
From: popcornmix <popcornmix@gmail.com>
Date: Tue, 24 May 2016 16:20:09 +0100
Subject: [PATCH] bcm2835-camera: Fix max/min error when looping over
 cameras/resolutions

See: https://github.com/raspberrypi/linux/issues/1447#issuecomment-221303506
---
 drivers/media/platform/bcm2835/bcm2835-camera.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/media/platform/bcm2835/bcm2835-camera.c
+++ b/drivers/media/platform/bcm2835/bcm2835-camera.c
@@ -1530,8 +1530,8 @@ static int get_num_cameras(struct vchiq_
 	}
 	for (i = 0;
 	     i < (cam_info.num_cameras > num_resolutions ?
-			cam_info.num_cameras :
-			num_resolutions);
+			num_resolutions :
+			cam_info.num_cameras);
 	     i++) {
 		resolutions[i][0] = cam_info.cameras[i].max_width;
 		resolutions[i][1] = cam_info.cameras[i].max_height;