Commit f66a9bee authored by Luca Ellero's avatar Luca Ellero Committed by Greg Kroah-Hartman
Browse files

staging: ced1401: fix ced_allowi() 



Rename camel case arguments and locals in function ced_allowi()

Signed-off-by: default avatarLuca Ellero <luca.ellero@brickedbrain.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fbbd0c26

drivers/staging/ced1401/usb1401.c

+26 −21
Original line number Diff line number Diff line
@@ -1272,16 +1272,17 @@ static void ced_readchar_callback(struct urb *urb) 
****************************************************************************/

int ced_allowi(struct ced_data *ced)

{

	int iReturn = U14ERR_NOERROR;

	int retval = U14ERR_NOERROR;

	unsigned long flags;



	/* can be called in multiple contexts */

	spin_lock_irqsave(&ced->char_in_lock, flags);



	/*  We don't want char input running while DMA is in progress as we know that this */

	/*   can cause sequencing problems for the 2270. So don't. It will also allow the */

	/*   ERR response to get back to the host code too early on some PCs, even if there */

	/*   is no actual driver failure, so we don't allow this at all. */

	/* We don't want char input running while DMA is in progress as we    */

	/* know that this can cause sequencing problems for the 2270. So      */

	/* don't. It will also allow the ERR response to get back to the host */

	/* code too early on some PCs, even if there is no actual driver      */

	/* failure, so we don't allow this at all. */

	if (!ced->in_draw_down &&	/* stop input if */

	    !ced->read_chars_pending &&	/* If no read request outstanding */

	    (ced->num_input < (INBUF_SZ / 2)) && /*  and there is some space */
@@ -1289,15 +1290,17 @@ int ced_allowi(struct ced_data *ced) 
	    (!ced->xfer_waiting) &&               /* no xfer waiting to start */

	    (can_accept_io_requests(ced))) { /* and activity is generally OK */

				/*   then off we go */

		unsigned int nMax = INBUF_SZ - ced->num_input; /*  max we could read */

		int nPipe = ced->n_pipes == 4 ? 1 : 0;	/*  The pipe number to use */

		/* max we could read */

		unsigned int max = INBUF_SZ - ced->num_input;

		/* The pipe number to use */

		int pipe = ced->n_pipes == 4 ? 1 : 0;



		dev_dbg(&ced->interface->dev, "%s: %d chars in input buffer\n",

			__func__, ced->num_input);



		usb_fill_int_urb(ced->urb_char_in, ced->udev,

				 usb_rcvintpipe(ced->udev, ced->ep_addr[nPipe]),

				 ced->coher_char_in, nMax, ced_readchar_callback,

				 usb_rcvintpipe(ced->udev, ced->ep_addr[pipe]),

				 ced->coher_char_in, max, ced_readchar_callback,

				 ced, ced->interval);



		/* short xfers are OK by default */
@@ -1306,21 +1309,23 @@ int ced_allowi(struct ced_data *ced) 
		/* in case we need to kill it */

		usb_anchor_urb(ced->urb_char_in, &ced->submitted);



		iReturn = usb_submit_urb(ced->urb_char_in, GFP_ATOMIC);

		if (iReturn) {

			usb_unanchor_urb(ced->urb_char_in);	/*  remove from list of active Urbs */

			ced->pipe_error[nPipe] = 1;	/*  Flag an error to be handled later */

		retval = usb_submit_urb(ced->urb_char_in, GFP_ATOMIC);

		if (retval) {

			/* remove from list of active Urbs */

			usb_unanchor_urb(ced->urb_char_in);

			/* Flag an error to be handled later */

			ced->pipe_error[pipe] = 1;

			dev_err(&ced->interface->dev,

				"%s: submit urb failed: %d\n",

				__func__, iReturn);

				__func__, retval);

		} else

			ced->read_chars_pending = true;	/*  Flag that we are active here */

			/* Flag that we are active here */

			ced->read_chars_pending = true;

	}



	spin_unlock_irqrestore(&ced->char_in_lock, flags);



	return iReturn;



	return retval;

}



/*****************************************************************************