Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 22:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: stkwebcam: move stk_camera_read_reg() scratch buffer to struct stk_camera

Browse Source 
In stk_camera_read_reg() a single byte buffer is alloc-ed and
freed on every function call.  Since the size is known,
move the buffer to the struct stk_camera where it will be alloc-ed
and freed once.

Signed-off-by: Tom Rix <trix@redhat.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Tom Rix 2022-03-12 18:30:49 +01:00 committed by Mauro Carvalho Chehab
parent 67e33dd957
commit 6d644a6300
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/media/usb/stkwebcam/stk-webcam.c
View File

@ -150,25 +150,18 @@ int stk_camera_write_reg(struct stk_camera *dev, u16 index, u8 value)
int stk_camera_read_reg(struct stk_camera *dev, u16 index, u8 *value) int stk_camera_read_reg(struct stk_camera *dev, u16 index, u8 *value)
{ {
struct usb_device *udev = dev->udev; struct usb_device *udev = dev->udev;
unsigned char *buf;
int ret; int ret;
buf = kmalloc(sizeof(u8), GFP_KERNEL);
if (!buf)
return -ENOMEM;
ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
0x00, 0x00,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0x00, 0x00,
index, index,
buf, &dev->read_reg_scratch,
sizeof(u8), sizeof(u8),
500); 500);
if (ret >= 0) if (ret >= 0)
*value = *buf; *value = dev->read_reg_scratch;
kfree(buf);
if (ret < 0) if (ret < 0)
return ret; return ret;

2
drivers/media/usb/stkwebcam/stk-webcam.h
View File

@ -105,6 +105,8 @@ struct stk_camera {
struct list_head sio_avail; struct list_head sio_avail;
struct list_head sio_full; struct list_head sio_full;
unsigned sequence; unsigned sequence;
u8 read_reg_scratch;
}; };
#define vdev_to_camera(d) container_of(d, struct stk_camera, vdev) #define vdev_to_camera(d) container_of(d, struct stk_camera, vdev)