summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Metzler <rjkm@metzlerbros.de>2017-06-25 18:37:05 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-06-26 08:13:30 -0300
commitcb61488a2f42b14b64e8bc9496299718e92cd49a (patch)
treea94b05574469eb295ea59354cae4a2e5f5a986e1
parent4ee92289c269dfe91e0e3858399c244dc92fa20e (diff)
downloadlinux-stable-cb61488a2f42b14b64e8bc9496299718e92cd49a.tar.gz
linux-stable-cb61488a2f42b14b64e8bc9496299718e92cd49a.tar.bz2
linux-stable-cb61488a2f42b14b64e8bc9496299718e92cd49a.zip
media: dvb_ca_en50221: State UNINITIALISED instead of INVALID
In case of a linkinit failure change to state UNINITIALISED to re-init the CAM. Original code change by Ralph Metzler, modified by Jasmin Jessich to match Kernel code style. Signed-off-by: Ralph Metzler <rjkm@metzlerbros.de> Signed-off-by: Jasmin Jessich <jasmin@anw.at> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--drivers/media/dvb-core/dvb_ca_en50221.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
index af694f2066a2..80edbe87be18 100644
--- a/drivers/media/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb-core/dvb_ca_en50221.c
@@ -1176,7 +1176,8 @@ static int dvb_ca_en50221_thread(void *data)
pr_err("dvb_ca adapter %d: DVB CAM link initialisation failed :(\n",
ca->dvbdev->adapter->num);
- ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_INVALID;
+ ca->slot_info[slot].slot_state =
+ DVB_CA_SLOTSTATE_UNINITIALISED;
dvb_ca_en50221_thread_update_delay(ca);
break;
}