From 36f1b6f8bb025d58b1dddc0fc2e7b485bc6f70e0 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Mon, 9 Apr 2012 16:50:04 -0300 Subject: [PATCH] --- yaml --- r: 306165 b: refs/heads/master c: 3fc82fa001cac8f22e7493a02c795f2bb33cafac h: refs/heads/master i: 306163: 5d79ed6b66cb0fe2c9f7331d524d278b8bc8888e v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s2255drv.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5f11f7a764f5..b95733a07e10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b803cc58c33c0c5b6220150336a6f1c7958f1404 +refs/heads/master: 3fc82fa001cac8f22e7493a02c795f2bb33cafac diff --git a/trunk/drivers/media/video/s2255drv.c b/trunk/drivers/media/video/s2255drv.c index 4894cbb1c547..37845def41c5 100644 --- a/trunk/drivers/media/video/s2255drv.c +++ b/trunk/drivers/media/video/s2255drv.c @@ -1826,8 +1826,7 @@ static void s2255_destroy(struct s2255_dev *dev) usb_free_urb(dev->fw_data->fw_urb); dev->fw_data->fw_urb = NULL; } - if (dev->fw_data->fw) - release_firmware(dev->fw_data->fw); + release_firmware(dev->fw_data->fw); kfree(dev->fw_data->pfw_data); kfree(dev->fw_data); /* reset the DSP so firmware can be reloaded next time */