| Message ID | 20191012151805.17988-1-jbi.octave@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f152f52c308dbaf41f3874805f9a2811f96730da |
| Headers | show |
| Series | [v2] staging: vc04_services: place the AND operator at the end of the previous line | expand |
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index d4d1e44b16b2..beb6a0063bb8 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -1090,8 +1090,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, ret = vchiq_mmal_port_set_format(dev->instance, camera_port); - if (!ret - && camera_port == + if (!ret && + camera_port == &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO]) { bool overlay_enabled = !!dev->component[COMP_PREVIEW]->enabled;
Place the AND logical operator at the end of the previous line; to fix warning of "Logical continuations should be on the previous line". Issue detected by checkpatch tool. Signed-off-by: Jules Irenge <jbi.octave@gmail.com> --- drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)