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

staging: ced1401: fix ced_send_string() 



Rename camel case arguments and locals in function ced_send_string()

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

drivers/staging/ced1401/ced_ioc.c

+8 −7
Original line number Diff line number Diff line
@@ -103,18 +103,19 @@ static int ced_put_chars(struct ced_data *ced, const char *ch, 
}



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

** Add the data in pData (local pointer) of length n to the output buffer, and

** Add the data in "data" local pointer of length n to the output buffer, and

** trigger an output transfer if this is appropriate. User mode.

** Holds the io_mutex

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

int ced_send_string(struct ced_data *ced, const char __user *pData,

int ced_send_string(struct ced_data *ced, const char __user *data,

	       unsigned int n)

{

	int iReturn = U14ERR_NOERROR;	/*  assume all will be well */

	char buffer[OUTBUF_SZ + 1];	/*  space in our address space for characters */

	int ret = U14ERR_NOERROR;	/* assume all will be well */

	char buffer[OUTBUF_SZ + 1];	/* space in our address space */

					/* for characters             */

	if (n > OUTBUF_SZ)	/*  check space in local buffer... */

		return U14ERR_NOOUT;	/*  ...too many characters */

	if (copy_from_user(buffer, pData, n))

	if (copy_from_user(buffer, data, n))

		return -EFAULT;

	buffer[n] = 0;		/*  terminate for debug purposes */
@@ -122,13 +123,13 @@ int ced_send_string(struct ced_data *ced, const char __user *pData, 
	if (n > 0) {		/*  do nothing if nowt to do! */

		dev_dbg(&ced->interface->dev, "%s: n=%d>%s<\n",

			__func__, n, buffer);

		iReturn = ced_put_chars(ced, buffer, n);

		ret = ced_put_chars(ced, buffer, n);

	}



	ced_allowi(ced);		/*  make sure we have input int */

	mutex_unlock(&ced->io_mutex);



	return iReturn;

	return ret;

}



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

drivers/staging/ced1401/usb1401.h

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ extern int ced_read_write_mem(struct ced_data *ced, bool read, 


/*  in ced_ioc.c */

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

extern int ced_send_string(struct ced_data *ced, const char __user *pData, unsigned int n);

extern int ced_send_string(struct ced_data *ced, const char __user *data, unsigned int n);

extern int ced_send_char(struct ced_data *ced, char c);

extern int ced_get_state(struct ced_data *ced, __u32 *state, __u32 *error);

extern int ced_read_write_cancel(struct ced_data *ced);