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

staging: ced1401: fix ced_test_event() 



Rename camel case arguments and locals in function ced_test_event()

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

drivers/staging/ced1401/ced_ioc.c

+11 −9
Original line number Diff line number Diff line
@@ -916,21 +916,23 @@ int ced_wait_event(struct ced_data *ced, int area, int time_out) 
** number of times a block completed since the last call, or 0 if none or a

** negative error.

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

int ced_test_event(struct ced_data *ced, int nArea)

int ced_test_event(struct ced_data *ced, int area)

{

	int iReturn;

	if ((unsigned)nArea >= MAX_TRANSAREAS)

		iReturn = U14ERR_BADAREA;

	int ret;

	if ((unsigned)area >= MAX_TRANSAREAS)

		ret = U14ERR_BADAREA;

	else {

		struct transarea *pTA = &ced->trans_def[nArea];

		mutex_lock(&ced->io_mutex);	/*  make sure we have no competitor */

		struct transarea *ta = &ced->trans_def[area];



		 /* make sure we have no competitor */

		mutex_lock(&ced->io_mutex);

		spin_lock_irq(&ced->staged_lock);

		iReturn = pTA->wake_up;	/*  get wakeup count since last call */

		pTA->wake_up = 0;	/*  clear the count */

		ret = ta->wake_up;	/*  get wakeup count since last call */

		ta->wake_up = 0;	/*  clear the count */

		spin_unlock_irq(&ced->staged_lock);

		mutex_unlock(&ced->io_mutex);

	}

	return iReturn;

	return ret;

}



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

drivers/staging/ced1401/usb1401.h

+1 −1
Original line number Diff line number Diff line
@@ -253,6 +253,6 @@ extern int ced_dbg_stop_loop(struct ced_data *ced); 
extern int ced_set_circular(struct ced_data *ced, struct transfer_area_desc __user *pTD);

extern int ced_get_circ_block(struct ced_data *ced, TCIRCBLOCK __user *pCB);

extern int ced_free_circ_block(struct ced_data *ced, TCIRCBLOCK __user *pCB);

extern int ced_test_event(struct ced_data *ced, int nArea);

extern int ced_wait_event(struct ced_data *ced, int area, int time_out);

extern int ced_test_event(struct ced_data *ced, int area);

#endif