Commit eb76255e authored by Dave Stevenson's avatar Dave Stevenson Committed by Phil Elwell
Browse files

staging/vc04_services: Resolve merge issue over atomic_inc/dec

e59fc3ed "staging: bcm2835_camera: Ensure all buffers are returned on
disable" was upstreamed and then backported to 4.19 as fcbc6ddc.
In merging that upstream update back into our tree, the merge
has failed and we have ended up with duplication of the lines.

Fix up this merge issue.

https://github.com/raspberrypi/linux/issues/3124



Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
parent c76cadf3
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment