github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 05:55:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: drivers: usb: gadget: 64-bit related type fixes

Browse Source 
Change-Id: I2f9b12e1e0cdfe64ffe20db78d319a6221821184
Signed-off-by: Greg Hackmann <ghackmann@google.com>
This commit is contained in:
Greg Hackmann 2014-02-24 10:19:13 -08:00 committed by Dmitry Shmidt
parent e73ec50912
commit 1b07ec7515
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/usb/gadget/f_accessory.c
View File

@ -552,10 +552,11 @@ static ssize_t acc_read(struct file *fp, char __user *buf,
{ {
struct acc_dev *dev = fp->private_data; struct acc_dev *dev = fp->private_data;
struct usb_request *req; struct usb_request *req;
int r = count, xfer; ssize_t r = count;
unsigned xfer;
int ret = 0; int ret = 0;
pr_debug("acc_read(%d)\n", count); pr_debug("acc_read(%zu)\n", count);
if (dev->disconnected) if (dev->disconnected)
return -ENODEV; return -ENODEV;
@ -596,7 +597,7 @@ static ssize_t acc_read(struct file *fp, char __user *buf,
if (req->actual == 0) if (req->actual == 0)
goto requeue_req; goto requeue_req;
pr_debug("rx %p %d\n", req, req->actual); pr_debug("rx %p %u\n", req, req->actual);
xfer = (req->actual < count) ? req->actual : count; xfer = (req->actual < count) ? req->actual : count;
r = xfer; r = xfer;
if (copy_to_user(buf, req->buf, xfer)) if (copy_to_user(buf, req->buf, xfer))
@ -605,7 +606,7 @@ static ssize_t acc_read(struct file *fp, char __user *buf,
r = -EIO; r = -EIO;
done: done:
pr_debug("acc_read returning %d\n", r); pr_debug("acc_read returning %zd\n", r);
return r; return r;
} }
@ -614,10 +615,11 @@ static ssize_t acc_write(struct file *fp, const char __user *buf,
{ {
struct acc_dev *dev = fp->private_data; struct acc_dev *dev = fp->private_data;
struct usb_request *req = 0; struct usb_request *req = 0;
int r = count, xfer; ssize_t r = count;
unsigned xfer;
int ret; int ret;
pr_debug("acc_write(%d)\n", count); pr_debug("acc_write(%zu)\n", count);
if (!dev->online || dev->disconnected) if (!dev->online || dev->disconnected)
return -ENODEV; return -ENODEV;
@ -665,7 +667,7 @@ static ssize_t acc_write(struct file *fp, const char __user *buf,
if (req) if (req)
req_put(dev, &dev->tx_idle, req); req_put(dev, &dev->tx_idle, req);
pr_debug("acc_write returning %d\n", r); pr_debug("acc_write returning %zd\n", r);
return r; return r;
} }

16
drivers/usb/gadget/f_mtp.c
View File

@ -466,10 +466,11 @@ static ssize_t mtp_read(struct file *fp, char __user *buf,
struct mtp_dev *dev = fp->private_data; struct mtp_dev *dev = fp->private_data;
struct usb_composite_dev *cdev = dev->cdev; struct usb_composite_dev *cdev = dev->cdev;
struct usb_request *req; struct usb_request *req;
int r = count, xfer; ssize_t r = count;
unsigned xfer;
int ret = 0; int ret = 0;
DBG(cdev, "mtp_read(%d)\n", count); DBG(cdev, "mtp_read(%zu)\n", count);
if (count > MTP_BULK_BUFFER_SIZE) if (count > MTP_BULK_BUFFER_SIZE)
return -EINVAL; return -EINVAL;
@ -533,7 +534,7 @@ static ssize_t mtp_read(struct file *fp, char __user *buf,
dev->state = STATE_READY; dev->state = STATE_READY;
spin_unlock_irq(&dev->lock); spin_unlock_irq(&dev->lock);
DBG(cdev, "mtp_read returning %d\n", r); DBG(cdev, "mtp_read returning %zd\n", r);
return r; return r;
} }
@ -543,11 +544,12 @@ static ssize_t mtp_write(struct file *fp, const char __user *buf,
struct mtp_dev *dev = fp->private_data; struct mtp_dev *dev = fp->private_data;
struct usb_composite_dev *cdev = dev->cdev; struct usb_composite_dev *cdev = dev->cdev;
struct usb_request *req = 0; struct usb_request *req = 0;
int r = count, xfer; ssize_t r = count;
unsigned xfer;
int sendZLP = 0; int sendZLP = 0;
int ret; int ret;
DBG(cdev, "mtp_write(%d)\n", count); DBG(cdev, "mtp_write(%zu)\n", count);
spin_lock_irq(&dev->lock); spin_lock_irq(&dev->lock);
if (dev->state == STATE_CANCELED) { if (dev->state == STATE_CANCELED) {
@ -624,7 +626,7 @@ static ssize_t mtp_write(struct file *fp, const char __user *buf,
dev->state = STATE_READY; dev->state = STATE_READY;
spin_unlock_irq(&dev->lock); spin_unlock_irq(&dev->lock);
DBG(cdev, "mtp_write returning %d\n", r); DBG(cdev, "mtp_write returning %zd\n", r);
return r; return r;
} }
@ -823,7 +825,7 @@ static int mtp_send_event(struct mtp_dev *dev, struct mtp_event *event)
int ret; int ret;
int length = event->length; int length = event->length;
DBG(dev->cdev, "mtp_send_event(%d)\n", event->length); DBG(dev->cdev, "mtp_send_event(%zu)\n", event->length);
if (length < 0 || length > INTR_BUFFER_SIZE) if (length < 0 || length > INTR_BUFFER_SIZE)
return -EINVAL; return -EINVAL;