diff --git a/[refs] b/[refs]
index 3c986a0a05e4..7e174bb32cd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf30690029a3b8572a6fc2facb77fbde86992988
+refs/heads/master: 2da8eab97544266020a8cddb2936237abbb93859
diff --git a/trunk/drivers/media/common/siano/smscoreapi.c b/trunk/drivers/media/common/siano/smscoreapi.c
index 1842e64e6338..9565dcc8381f 100644
--- a/trunk/drivers/media/common/siano/smscoreapi.c
+++ b/trunk/drivers/media/common/siano/smscoreapi.c
@@ -719,8 +719,7 @@ void smscore_unregister_device(struct smscore_device_t *coredev)
 		dma_free_coherent(NULL, coredev->common_buffer_size,
 			coredev->common_buffer, coredev->common_buffer_phys);
 
-	if (coredev->fw_buf != NULL)
-		kfree(coredev->fw_buf);
+	kfree(coredev->fw_buf);
 
 	list_del(&coredev->entry);
 	kfree(coredev);