Commit dd6fa4d7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: image: mdc800: clean up urb->status usage 



This done in anticipation of removal of urb->status, which will make
that patch easier to review and apply in the future.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 62e5a330

drivers/usb/image/mdc800.c

+21 −24
Original line number Diff line number Diff line
@@ -284,9 +284,9 @@ static void mdc800_usb_irq (struct urb *urb) 
	int data_received=0, wake_up;

	unsigned char* b=urb->transfer_buffer;

	struct mdc800_data* mdc800=urb->context;

	int status = urb->status;



	if (urb->status >= 0)

	{

	if (status >= 0) {



		//dbg ("%i %i %i %i %i %i %i %i \n",b[0],b[1],b[2],b[3],b[4],b[5],b[6],b[7]);
@@ -324,7 +324,7 @@ static void mdc800_usb_irq (struct urb *urb) 
		||

			((mdc800->camera_request_ready == 3) && (mdc800->camera_busy))

		||

			(urb->status < 0)

			(status < 0)

		);



	if (wake_up)
@@ -376,15 +376,12 @@ static int mdc800_usb_waitForIRQ (int mode, int msec) 
static void mdc800_usb_write_notify (struct urb *urb)

{

	struct mdc800_data* mdc800=urb->context;

	int status = urb->status;



	if (urb->status != 0)

	{

		err ("writing command fails (status=%i)", urb->status);

	}

	if (status != 0)

		err ("writing command fails (status=%i)", status);

	else

	{	

		mdc800->state=READY;

	}

	mdc800->written = 1;

	wake_up (&mdc800->write_wait);

}
@@ -396,9 +393,9 @@ static void mdc800_usb_write_notify (struct urb *urb) 
static void mdc800_usb_download_notify (struct urb *urb)

{

	struct mdc800_data* mdc800=urb->context;

	int status = urb->status;



	if (urb->status == 0)

	{

	if (status == 0) {

		/* Fill output buffer with these data */

		memcpy (mdc800->out,  urb->transfer_buffer, 64);

		mdc800->out_count=64;
@@ -408,10 +405,8 @@ static void mdc800_usb_download_notify (struct urb *urb) 
		{

			mdc800->state=READY;

		}

	}

	else

	{

		err ("request bytes fails (status:%i)", urb->status);

	} else {

		err ("request bytes fails (status:%i)", status);

	}

	mdc800->downloaded = 1;

	wake_up (&mdc800->download_wait);
@@ -649,9 +644,9 @@ static int mdc800_device_open (struct inode* inode, struct file *file) 


	retval=0;

	mdc800->irq_urb->dev = mdc800->dev;

	if (usb_submit_urb (mdc800->irq_urb, GFP_KERNEL))

	{

		err ("request USB irq fails (submit_retval=%i urb_status=%i).",retval, mdc800->irq_urb->status);

	retval = usb_submit_urb (mdc800->irq_urb, GFP_KERNEL);

	if (retval) {

		err ("request USB irq fails (submit_retval=%i).", retval);

		errn = -EIO;

		goto error_out;

	}
@@ -698,6 +693,7 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l 
{

	size_t left=len, sts=len; /* single transfer size */

	char __user *ptr = buf;

	int retval;



	mutex_lock(&mdc800->io_lock);

	if (mdc800->state == NOT_CONNECTED)
@@ -737,9 +733,9 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l 


				/* Download -> Request new bytes */

				mdc800->download_urb->dev = mdc800->dev;

				if (usb_submit_urb (mdc800->download_urb, GFP_KERNEL))

				{

					err ("Can't submit download urb (status=%i)",mdc800->download_urb->status);

				retval = usb_submit_urb (mdc800->download_urb, GFP_KERNEL);

				if (retval) {

					err ("Can't submit download urb (retval=%i)",retval);

					mutex_unlock(&mdc800->io_lock);

					return len-left;

				}
@@ -788,6 +784,7 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l 
static ssize_t mdc800_device_write (struct file *file, const char __user *buf, size_t len, loff_t *pos)

{

	size_t i=0;

	int retval;



	mutex_lock(&mdc800->io_lock);

	if (mdc800->state != READY)
@@ -854,9 +851,9 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s 
			mdc800->state=WORKING;

			memcpy (mdc800->write_urb->transfer_buffer, mdc800->in,8);

			mdc800->write_urb->dev = mdc800->dev;

			if (usb_submit_urb (mdc800->write_urb, GFP_KERNEL))

			{

				err ("submitting write urb fails (status=%i)", mdc800->write_urb->status);

			retval = usb_submit_urb (mdc800->write_urb, GFP_KERNEL);

			if (retval) {

				err ("submitting write urb fails (retval=%i)", retval);

				mutex_unlock(&mdc800->io_lock);

				return -EIO;

			}