From 971b1bcbec88251d5d7c112f782adf332a62186e Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Wed, 25 May 2011 17:25:53 -0300
Subject: [PATCH] --- yaml --- r: 261193 b: refs/heads/master c:
 050bf0faa833028f30ed3ad6a8fc5e51994dabfe h: refs/heads/master i:   261191:
 df1fdd61e9ff0321e1fa44b6a4afab35385020b7 v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/dvb/frontends/cxd2820r_core.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 58c862051ac7..97724d4c4c44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58b0ed25b6e9d6dbf00c30b816e8a2a0fec2bec8
+refs/heads/master: 050bf0faa833028f30ed3ad6a8fc5e51994dabfe
diff --git a/trunk/drivers/media/dvb/frontends/cxd2820r_core.c b/trunk/drivers/media/dvb/frontends/cxd2820r_core.c
index 903cbdbbc73b..d416e85589e1 100644
--- a/trunk/drivers/media/dvb/frontends/cxd2820r_core.c
+++ b/trunk/drivers/media/dvb/frontends/cxd2820r_core.c
@@ -314,6 +314,8 @@ static int cxd2820r_set_frontend(struct dvb_frontend *fe,
 			} else if (c->delivery_system == SYS_DVBT2) {
 				/* DVB-T => DVB-T2 */
 				ret = cxd2820r_sleep_t(fe);
+				if (ret)
+					break;
 				ret = cxd2820r_set_frontend_t2(fe, p);
 			}
 			break;
@@ -324,6 +326,8 @@ static int cxd2820r_set_frontend(struct dvb_frontend *fe,
 			} else if (c->delivery_system == SYS_DVBT) {
 				/* DVB-T2 => DVB-T */
 				ret = cxd2820r_sleep_t2(fe);
+				if (ret)
+					break;
 				ret = cxd2820r_set_frontend_t(fe, p);
 			}
 			break;