Added timeout to write loop

1 files changed, 15 insertions, 5 deletions

diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index 64449e255..068c49e48 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -611,7 +611,7 @@ static int dvb_ca_en50221_read_data(struct dvb_ca_private* ca, int slot, u8* ebu
 
                 /* OK, store it in the buffer */
                 buf[i] = status;
-        }
+	}
 
         /* check for read error (RE should now go to 0) */
         if ((status = ca->pub->read_cam_control(ca->pub, slot, CTRLIF_STATUS)) < 0) goto exit;
@@ -1198,6 +1198,8 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file, const char *buf, size_
         char fragbuf[HOST_LINK_BUF_SIZE];
         int fragpos = 0;
         int fraglen;
+        unsigned long timeout;
+        int written;
 
         dprintk ("%s\n", __FUNCTION__);
 
@@ -1222,14 +1224,22 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file, const char *buf, size_
                 fragbuf[1] = ((fragpos + fraglen) < count) ? 0x80 : 0x00;
                 if ((status = copy_from_user(fragbuf+2, buf+fragpos, fraglen)) != 0) goto exit;
 
-                // FIXME: can this loop be improved?
-                while(1) {
+		timeout = jiffies + HZ/2;
+	        written = 0;
+                while(!time_after(jiffies, timeout)) {
                         status = dvb_ca_en50221_write_data(ca, slot, fragbuf, fraglen+2);
-                        if (status == (fraglen+2)) break;
+		        if (status == (fraglen+2)) {
+			       written = 1;
+			       break;
+			}
                         if (status != -EAGAIN) goto exit;
 
                         dvb_delay(1);
                 }
+	        if (!written) {
+		        status = -EIO;
+		        goto exit;
+		}
 
                 fragpos += fraglen;
         }
@@ -1347,7 +1357,7 @@ static ssize_t dvb_ca_en50221_io_read(struct file *file, char *buf, size_t count
                                         fraglen -= 2;
                                 }
 
-                                if ((status = dvb_ringbuffer_pkt_read(&ca->slot_info[slot].rx_buffer, idx, 2, buf + pktlen, fraglen, 1)) < 0) {
+			        if ((status = dvb_ringbuffer_pkt_read(&ca->slot_info[slot].rx_buffer, idx, 2, buf + pktlen, fraglen, 1)) < 0) {
                                         goto exit;
                                 }
                                 pktlen += fraglen;