Merge "USB: f_fs: Add print message in case of error scenario" (64a6f3e8) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/gadget/f_fs.c

+14 −2

Original line number	Diff line number	Diff line
		@@ -762,6 +762,7 @@ static void ffs_epfile_io_complete(struct usb_ep _ep, struct usb_request req)
		}
		}

		#define MAX_BUF_LEN 4096
		static ssize_t ffs_epfile_io(struct file *file,
		char __user *buf, size_t len, int read)
		{
		@@ -911,17 +912,28 @@ first_try:
		ret = -ENODEV;
		spin_unlock_irq(&epfile->ffs->eps_lock);
		if (read && ret > 0) {
		if (ret > len)
		if (len != MAX_BUF_LEN && ret < len)
		pr_err("less data(%zd) recieved than intended length(%zu)\n",
		ret, len);
		if (ret > len) {
		ret = -EOVERFLOW;
		else if (unlikely(copy_to_user(buf, data, ret)))
		pr_err("More data(%zd) recieved than intended length(%zu)\n",
		ret, len);
		} else if (unlikely(copy_to_user(
		buf, data, ret))) {
		pr_err("Fail to copy to user len:%zd\n",
		ret);
		ret = -EFAULT;
		}
		}
		}
		}

		mutex_unlock(&epfile->mutex);
		error:
		kfree(data);
		if (ret < 0)
		pr_err("Error: returning %zd value\n", ret);
		return ret;
		}