UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] au0828: remove control buffer from send_control_msg 

There are no cases where a control message is ever sent to the au0828
with an actual buffer defined.  Remove the reference to dev->ctrlmsg,
which currently requires us to hold a mutex since it is shared with the
read function.

Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Devin Heitmueller 2012-08-06 22:47:05 -03:00 committed by Mauro Carvalho Chehab
parent faaf01b2f6
commit 8ff63de690
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/video/au0828/au0828-core.c
View File

@ -46,7 +46,7 @@ MODULE_PARM_DESC(disable_usb_speed_check,
#define _BULKPIPESIZE 0xffff #define _BULKPIPESIZE 0xffff
static int send_control_msg(struct au0828_dev *dev, u16 request, u32 value, static int send_control_msg(struct au0828_dev *dev, u16 request, u32 value,
u16 index, unsigned char *cp, u16 size); u16 index);
static int recv_control_msg(struct au0828_dev *dev, u16 request, u32 value, static int recv_control_msg(struct au0828_dev *dev, u16 request, u32 value,
u16 index, unsigned char *cp, u16 size); u16 index, unsigned char *cp, u16 size);
@ -64,8 +64,7 @@ u32 au0828_readreg(struct au0828_dev *dev, u16 reg)
u32 au0828_writereg(struct au0828_dev *dev, u16 reg, u32 val) u32 au0828_writereg(struct au0828_dev *dev, u16 reg, u32 val)
{ {
dprintk(8, "%s(0x%04x, 0x%02x)\n", __func__, reg, val); dprintk(8, "%s(0x%04x, 0x%02x)\n", __func__, reg, val);
return send_control_msg(dev, CMD_REQUEST_OUT, val, reg, return send_control_msg(dev, CMD_REQUEST_OUT, val, reg);
dev->ctrlmsg, 0);
} }
static void cmd_msg_dump(struct au0828_dev *dev) static void cmd_msg_dump(struct au0828_dev *dev)
@ -87,10 +86,10 @@ static void cmd_msg_dump(struct au0828_dev *dev)
} }
static int send_control_msg(struct au0828_dev *dev, u16 request, u32 value, static int send_control_msg(struct au0828_dev *dev, u16 request, u32 value,
u16 index, unsigned char *cp, u16 size) u16 index)
{ {
int status = -ENODEV; int status = -ENODEV;
mutex_lock(&dev->mutex);
if (dev->usbdev) { if (dev->usbdev) {
/* cp must be memory that has been allocated by kmalloc */ /* cp must be memory that has been allocated by kmalloc */
@ -99,8 +98,7 @@ static int send_control_msg(struct au0828_dev *dev, u16 request, u32 value,
request, request,
USB_DIR_OUT | USB_TYPE_VENDOR | USB_DIR_OUT | USB_TYPE_VENDOR |
USB_RECIP_DEVICE, USB_RECIP_DEVICE,
value, index, value, index, NULL, 0, 1000);
cp, size, 1000);
status = min(status, 0); status = min(status, 0);
@ -110,7 +108,7 @@ static int send_control_msg(struct au0828_dev *dev, u16 request, u32 value,
} }
} }
mutex_unlock(&dev->mutex);
return status; return status;
} }