diff --git a/[refs] b/[refs]
index 756fa5c0f788..ac3b49699a89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18552ea1322e218b43f7692d9358c930a6d81df1
+refs/heads/master: f1065c964869aecd5af04291476c358fd5ab9a8f
diff --git a/trunk/drivers/media/tuners/tuner-xc2028.c b/trunk/drivers/media/tuners/tuner-xc2028.c
index 09451737c77e..878d2c4d9e8e 100644
--- a/trunk/drivers/media/tuners/tuner-xc2028.c
+++ b/trunk/drivers/media/tuners/tuner-xc2028.c
@@ -1378,8 +1378,7 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
 	 * For the firmware name, keep a local copy of the string,
 	 * in order to avoid troubles during device release.
 	 */
-	if (priv->ctrl.fname)
-		kfree(priv->ctrl.fname);
+	kfree(priv->ctrl.fname);
 	memcpy(&priv->ctrl, p, sizeof(priv->ctrl));
 	if (p->fname) {
 		priv->ctrl.fname = kstrdup(p->fname, GFP_KERNEL);