Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1ca23d1 authored by Jasmin Jessich's avatar Jasmin Jessich Committed by Mauro Carvalho Chehab
Browse files

media: dvb_ca_en50221: Fixed block comments 



Fixed all:
  WARNING: Block comments use * on subsequent lines
Added also the missing opening empty comment line.

Signed-off-by: default avatarJasmin Jessich <jasmin@anw.at>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent b9af29e1

drivers/media/dvb-core/dvb_ca_en50221.c

+19 −10
Original line number Original line Diff line number Diff line
@@ -342,8 +342,10 @@ static int dvb_ca_en50221_link_init(struct dvb_ca_private *ca, int slot) 
	/* we'll be determining these during this function */

	/* we'll be determining these during this function */

	ca->slot_info[slot].da_irq_supported = 0;

	ca->slot_info[slot].da_irq_supported = 0;





	/* set the host link buffer size temporarily. it will be overwritten with the

	/*

	 * real negotiated size later. */

	 * set the host link buffer size temporarily. it will be overwritten

	 * with the real negotiated size later.

	 */

	ca->slot_info[slot].link_buf_size = 2;

	ca->slot_info[slot].link_buf_size = 2;





	/* read the buffer size from the CAM */

	/* read the buffer size from the CAM */
@@ -796,10 +798,12 @@ static int dvb_ca_en50221_write_data(struct dvb_ca_private *ca, int slot, 
	    (ca->slot_info[slot].slot_state != DVB_CA_SLOTSTATE_LINKINIT))

	    (ca->slot_info[slot].slot_state != DVB_CA_SLOTSTATE_LINKINIT))

		return ca->pub->write_data(ca->pub, slot, buf, bytes_write);

		return ca->pub->write_data(ca->pub, slot, buf, bytes_write);





	/* it is possible we are dealing with a single buffer implementation,

	/*

	   thus if there is data available for read or if there is even a read

	 * it is possible we are dealing with a single buffer implementation,

	   already in progress, we do nothing but awake the kernel thread to

	 * thus if there is data available for read or if there is even a read

	   process the data if necessary. */

	 * already in progress, we do nothing but awake the kernel thread to

	 * process the data if necessary.

	 */

	if ((status = ca->pub->read_cam_control(ca->pub, slot, CTRLIF_STATUS)) < 0)

	if ((status = ca->pub->read_cam_control(ca->pub, slot, CTRLIF_STATUS)) < 0)

		goto exitnowrite;

		goto exitnowrite;

	if (status & (STATUSREG_DA | STATUSREG_RE)) {

	if (status & (STATUSREG_DA | STATUSREG_RE)) {
@@ -899,8 +903,10 @@ static int dvb_ca_en50221_slot_shutdown(struct dvb_ca_private *ca, int slot) 
	ca->pub->slot_shutdown(ca->pub, slot);

	ca->pub->slot_shutdown(ca->pub, slot);

	ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;

	ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;





	/* need to wake up all processes to check if they're now

	/*

	   trying to write to a defunct CAM */

	 * need to wake up all processes to check if they're now trying to

	 * write to a defunct CAM

	 */

	wake_up_interruptible(&ca->wait_queue);

	wake_up_interruptible(&ca->wait_queue);





	dprintk("Slot %i shutdown\n", slot);

	dprintk("Slot %i shutdown\n", slot);
@@ -1686,8 +1692,11 @@ static int dvb_ca_en50221_io_open(struct inode *inode, struct file *file) 




		if (ca->slot_info[i].slot_state == DVB_CA_SLOTSTATE_RUNNING) {

		if (ca->slot_info[i].slot_state == DVB_CA_SLOTSTATE_RUNNING) {

			if (ca->slot_info[i].rx_buffer.data != NULL) {

			if (ca->slot_info[i].rx_buffer.data != NULL) {

				/* it is safe to call this here without locks because

				/*

				 * ca->open == 0. Data is not read in this case */

				 * it is safe to call this here without locks

				 * because ca->open == 0. Data is not read in

				 * this case

				 */

				dvb_ringbuffer_flush(&ca->slot_info[i].rx_buffer);

				dvb_ringbuffer_flush(&ca->slot_info[i].rx_buffer);

			}

			}

		}

		}