diff options
| author |   Dave Stevenson <dave.stevenson@raspberrypi.org> | 2019-06-29 14:48:27 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-01 09:09:39 +0200 |
| commit | 33cc62fafceaa431e810d963b389904e894e2378 (patch) | |
| tree | fff52aaff89f387984e04be83c597efad282f53b /drivers/staging/vc04_services | |
| parent | staging: bcm2835-camera: Unify header inclusion defines (diff) | |
| download | linux-dev-33cc62fafceaa431e810d963b389904e894e2378.tar.xz linux-dev-33cc62fafceaa431e810d963b389904e894e2378.zip | |
staging: bcm2835-camera: Fix multiple assignments should be avoided
Clear checkpatch complaints of "multiple assignments should be avoided"
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vc04_services')
| -rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index 2e9b424a4c2e..04f9fb4f977a 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -1035,11 +1035,12 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, /* Make a further decision on port based on resolution */ if (f->fmt.pix.width <= max_video_width && f->fmt.pix.height <= max_video_height) - camera_port = port = + camera_port = &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO]; else - camera_port = port = + camera_port = &dev->component[COMP_CAMERA]->output[CAM_PORT_CAPTURE]; + port = camera_port; break; case COMP_IMAGE_ENCODE: encode_component = dev->component[COMP_IMAGE_ENCODE]; |