---

yaml --- r: 306165 b: refs/heads/master c: 3fc82fa h: refs/heads/master i: 306163: 5d79ed6 v: v3
git-mirror · Apr 19, 2012 · 36f1b6f · 36f1b6f
1 parent 19c06b8
commit 36f1b6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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 */