From 5d29bb58e6b8d4e7d1a3b495085ce387f1f3f214 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 4 May 2010 09:31:13 -0300 Subject: [PATCH] --- yaml --- r: 193145 b: refs/heads/master c: a18e659170b9c551749e1c8cb5a969ea8d73e378 h: refs/heads/master i: 193143: 16e13853dc6c647acbe3f4f1fb9f763bcab630ab v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/az6027.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 18621823fe55..95d39bb95d9c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32ec4576c3fb37316b1d11a04b220527822f3f0d +refs/heads/master: a18e659170b9c551749e1c8cb5a969ea8d73e378 diff --git a/trunk/drivers/media/dvb/dvb-usb/az6027.c b/trunk/drivers/media/dvb/dvb-usb/az6027.c index baaa301c5768..6681ac1c56e3 100644 --- a/trunk/drivers/media/dvb/dvb-usb/az6027.c +++ b/trunk/drivers/media/dvb/dvb-usb/az6027.c @@ -701,10 +701,7 @@ static int az6027_ci_poll_slot_status(struct dvb_ca_en50221 *ca, int slot, int o } else ret = 0; - if (b[0] == 0) { - ret = 0; - - } else if (b[0] == 1) { + if (!ret && b[0] == 1) { ret = DVB_CA_EN50221_POLL_CAM_PRESENT | DVB_CA_EN50221_POLL_CAM_READY; }