summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesper Juhl <jj@chaosbits.net>2012-04-09 16:50:04 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-04-19 09:09:58 -0300
commit3fc82fa001cac8f22e7493a02c795f2bb33cafac (patch)
tree9295a176435e641643b5703b6272df75b1ad36b1
parentb803cc58c33c0c5b6220150336a6f1c7958f1404 (diff)
downloadlinux-3fc82fa001cac8f22e7493a02c795f2bb33cafac.tar.gz
linux-3fc82fa001cac8f22e7493a02c795f2bb33cafac.tar.bz2
linux-3fc82fa001cac8f22e7493a02c795f2bb33cafac.zip
[media] s2255drv: Remove redundant NULL test before release_firmware()
release_firmware() tests for NULL pointers on its own - there's no reason to do an explicit check before calling the function. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/s2255drv.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 4894cbb1c547..37845def41c5 100644
--- a/drivers/media/video/s2255drv.c
+++ b/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 */