The patch number 9093 was added via Jean-Francois Moine <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Erik Andren <[EMAIL PROTECTED]>
gspca: Cleanup code and small changes.
- convert some #define to enum.
- remove some comments.
- return ENOMEM on memory allocation failure.
Priority: normal
Signed-off-by: Erik Andren <[EMAIL PROTECTED]>
Signed-off-by: Jean-Francois Moine <[EMAIL PROTECTED]>
---
linux/drivers/media/video/gspca/gspca.c | 12 ++++--------
linux/drivers/media/video/gspca/gspca.h | 12 +++++++-----
linux/drivers/media/video/gspca/m5602/m5602_core.c | 1 -
3 files changed, 11 insertions(+), 14 deletions(-)
diff -r abea78812e87 -r 78ed007607e8 linux/drivers/media/video/gspca/gspca.c
--- a/linux/drivers/media/video/gspca/gspca.c Thu Oct 02 13:06:59 2008 +0200
+++ b/linux/drivers/media/video/gspca/gspca.c Fri Oct 03 13:46:50 2008 +0200
@@ -247,7 +247,7 @@ static void bulk_irq(struct urb *urb
* On LAST_PACKET, a new frame is returned.
*/
struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
- int packet_type,
+ enum gspca_packet_type packet_type,
struct gspca_frame *frame,
const __u8 *data,
int len)
@@ -327,7 +327,6 @@ static void *rvmalloc(unsigned long size
void *mem;
unsigned long adr;
-/* size = PAGE_ALIGN(size); (already done) */
mem = vmalloc_32(size);
if (mem != NULL) {
adr = (unsigned long) mem;
@@ -947,7 +946,6 @@ static int vidioc_querycap(struct file *
memset(cap, 0, sizeof *cap);
strncpy(cap->driver, gspca_dev->sd_desc->name, sizeof cap->driver);
-/* strncpy(cap->card, gspca_dev->cam.dev_name, sizeof cap->card); */
if (gspca_dev->dev->product != NULL) {
strncpy(cap->card, gspca_dev->dev->product,
sizeof cap->card);
@@ -1581,7 +1579,6 @@ static int vidioc_qbuf(struct file *file
}
frame->v4l2_buf.flags |= V4L2_BUF_FLAG_QUEUED;
-/* frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_DONE; */
if (frame->v4l2_buf.memory == V4L2_MEMORY_USERPTR) {
frame->v4l2_buf.m.userptr = v4l2_buf->m.userptr;
@@ -1846,22 +1843,21 @@ int gspca_dev_probe(struct usb_interface
if (dev_size < sizeof *gspca_dev)
dev_size = sizeof *gspca_dev;
gspca_dev = kzalloc(dev_size, GFP_KERNEL);
- if (gspca_dev == NULL) {
+ if (!gspca_dev) {
err("couldn't kzalloc gspca struct");
- return -EIO;
+ return -ENOMEM;
}
kref_init(&gspca_dev->kref);
gspca_dev->usb_buf = kmalloc(USB_BUF_SZ, GFP_KERNEL);
if (!gspca_dev->usb_buf) {
err("out of memory");
- ret = -EIO;
+ ret = -ENOMEM;
goto out;
}
gspca_dev->dev = dev;
gspca_dev->iface = interface->bInterfaceNumber;
gspca_dev->nbalt = intf->num_altsetting;
gspca_dev->sd_desc = sd_desc;
-/* gspca_dev->users = 0; (done by kzalloc) */
gspca_dev->nbufread = 2;
/* configure the subdriver and initialize the USB device */
diff -r abea78812e87 -r 78ed007607e8 linux/drivers/media/video/gspca/gspca.h
--- a/linux/drivers/media/video/gspca/gspca.h Thu Oct 02 13:06:59 2008 +0200
+++ b/linux/drivers/media/video/gspca/gspca.h Fri Oct 03 13:46:50 2008 +0200
@@ -106,10 +106,12 @@ struct sd_desc {
};
/* packet types when moving from iso buf to frame buf */
-#define DISCARD_PACKET 0
-#define FIRST_PACKET 1
-#define INTER_PACKET 2
-#define LAST_PACKET 3
+enum gspca_packet_type {
+ DISCARD_PACKET,
+ FIRST_PACKET,
+ INTER_PACKET,
+ LAST_PACKET
+};
struct gspca_frame {
__u8 *data; /* frame buffer */
@@ -175,7 +177,7 @@ int gspca_dev_probe(struct usb_interface
struct module *module);
void gspca_disconnect(struct usb_interface *intf);
struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev,
- int packet_type,
+ enum gspca_packet_type packet_type,
struct gspca_frame *frame,
const __u8 *data,
int len);
diff -r abea78812e87 -r 78ed007607e8
linux/drivers/media/video/gspca/m5602/m5602_core.c
--- a/linux/drivers/media/video/gspca/m5602/m5602_core.c Thu Oct 02
13:06:59 2008 +0200
+++ b/linux/drivers/media/video/gspca/m5602/m5602_core.c Fri Oct 03
13:46:50 2008 +0200
@@ -145,7 +145,6 @@ int m5602_probe_sensor(struct sd *sd)
sd_desc.nctrls = s5k83a.nctrls;
return 0;
}
-
/* More sensor probe function goes here */
info("Failed to find a sensor");
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/78ed007607e851cfe1af88d6ec440a38bbe8e58b
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
