diff options
| author | Wu Guoxing <b39297@freescale.com> | 2012-06-21 16:11:34 +0800 |
|---|---|---|
| committer | Wu Guoxing <b39297@freescale.com> | 2012-06-21 16:15:15 +0800 |
| commit | 6003011e740325fb1886e3c8070660a875b098ff (patch) | |
| tree | bda3e171cc7691084488e37466a9aa29cccc3152 | |
| parent | 83c9e92456ec351bc1948d6723013e2c8117ecc4 (diff) | |
ENGR00210937:v4l2: kernel dump caused by remove mxc_v4l2_capture
kernel dump when do "modprobe -r mxc_v4l2_capture"
this is caused by unregister wrong v4l2 int device when rmmod
Signed-off-by: Wu Guoxing <b39297@freescale.com>
| -rw-r--r-- | drivers/media/video/mxc/capture/mxc_v4l2_capture.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c index dcfc86800940..5bd4886fec02 100644 --- a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c +++ b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c @@ -176,15 +176,6 @@ static struct v4l2_int_master mxc_v4l2_master = { .detach = mxc_v4l2_master_detach, }; -static struct v4l2_int_device mxc_v4l2_int_device = { - .module = THIS_MODULE, - .name = "mxc_v4l2_cap", - .type = v4l2_int_type_master, - .u = { - .master = &mxc_v4l2_master, - }, -}; - /*************************************************************************** * Functions for handling Frame buffers. **************************************************************************/ @@ -2678,7 +2669,6 @@ static int mxc_v4l2_probe(struct platform_device *pdev) /* Set up the v4l2 device and register it*/ cam->self->priv = cam; - /* This function contains a bug that won't let this be rmmod'd. */ v4l2_int_device_register(cam->self); /* register v4l video device */ @@ -2727,7 +2717,7 @@ static int mxc_v4l2_remove(struct platform_device *pdev) &dev_attr_fsl_v4l2_overlay_property); pr_info("V4L2 freeing image input device\n"); - v4l2_int_device_unregister(&mxc_v4l2_int_device); + v4l2_int_device_unregister(cam->self); video_unregister_device(cam->video_dev); mxc_free_frame_buf(cam); |