Skip to content

Commit bccdd49

Browse files
6by9popcornmix
authored andcommitted
staging: bcm2835-camera: Initialise dev in v4l2_dev
Commit 42a2f66 ("staging: vc04_services: Move global g_state to vchiq_state") changed mmal_init to pass dev->v4l2_dev.dev to vchiq_mmal_init, however nothing iniitialised dev->v4l2_dev, so we got a NULL pointer dereference. Set dev->v4l2_dev.dev during bcm2835_mmal_probe. The device pointer could be passed into v4l2_device_register to set it, however that also has other effects that would need additional changes. Fixes: 42a2f66 ("staging: vc04_services: Move global g_state to vchiq_state") Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
1 parent a49bd48 commit bccdd49

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,6 +1909,7 @@ static int bcm2835_mmal_probe(struct vchiq_device *device)
19091909
__func__, ret);
19101910
goto free_dev;
19111911
}
1912+
dev->v4l2_dev.dev = &device->dev;
19121913

19131914
/* setup v4l controls */
19141915
ret = bcm2835_mmal_init_controls(dev, &dev->ctrl_handler);

0 commit comments

Comments
 (0)