From c8d3c8947cd52830fd73798d564e2771ebfdd802 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 19 Jul 2011 09:05:49 -0300 Subject: [PATCH] --- yaml --- r: 285697 b: refs/heads/master c: 32c67ecc4a690220cbd9fda442c70bc4ba9b2dac h: refs/heads/master i: 285695: 6001b761057945ffc3242ced19de3ca9da3d8a2f v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pwc/pwc-if.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 86114c03de10..824f4a2bad29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76ae853844dff124559e1b609b0c71c792a98221 +refs/heads/master: 32c67ecc4a690220cbd9fda442c70bc4ba9b2dac diff --git a/trunk/drivers/media/video/pwc/pwc-if.c b/trunk/drivers/media/video/pwc/pwc-if.c index df639268566f..c1806e3a2ca0 100644 --- a/trunk/drivers/media/video/pwc/pwc-if.c +++ b/trunk/drivers/media/video/pwc/pwc-if.c @@ -1266,14 +1266,14 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id return 0; err_video_unreg: - if (hint < MAX_DEV_HINTS) - device_hint[hint].pdev = NULL; video_unregister_device(&pdev->vdev); err_unregister_v4l2_dev: v4l2_device_unregister(&pdev->v4l2_dev); err_free_controls: v4l2_ctrl_handler_free(&pdev->ctrl_handler); err_free_mem: + if (hint < MAX_DEV_HINTS) + device_hint[hint].pdev = NULL; kfree(pdev); return rc; }