diff --git a/[refs] b/[refs]
index fb1daa34877d..4ad3ca8fef73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 882876bf9780fac570184b719a76140a1b1e4178
+refs/heads/master: 1808a698a87366f9d82945270355c2139df0a16d
diff --git a/trunk/drivers/media/video/tuner-xc2028.c b/trunk/drivers/media/video/tuner-xc2028.c
index 7d53d58aafa1..c5bdeff54288 100644
--- a/trunk/drivers/media/video/tuner-xc2028.c
+++ b/trunk/drivers/media/video/tuner-xc2028.c
@@ -639,6 +639,8 @@ static int xc2028_dvb_release(struct dvb_frontend *fe)
 	priv->count--;
 
 	if (!priv->count) {
+		list_del(&priv->xc2028_list);
+
 		if (priv->ctrl.fname)
 			kfree(priv->ctrl.fname);
 
@@ -728,7 +730,6 @@ int xc2028_attach(struct dvb_frontend *fe, struct i2c_adapter* i2c_adap,
 	list_for_each_entry(priv, &xc2028_list, xc2028_list) {
 		if (priv->dev == dev) {
 			dev = NULL;
-			priv->count++;
 		}
 	}
 
@@ -754,6 +755,7 @@ int xc2028_attach(struct dvb_frontend *fe, struct i2c_adapter* i2c_adap,
 
 		list_add_tail(&priv->xc2028_list,&xc2028_list);
 	}
+	priv->count++;
 
 	memcpy(&fe->ops.tuner_ops, &xc2028_dvb_tuner_ops,
 					       sizeof(xc2028_dvb_tuner_ops));