aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-04-04 19:23:26 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-04-04 19:25:36 (GMT)
commitd38f4ed1e7e45793f20d0ac8092f254910b69d3c (patch)
tree3a1dc1f0509cf291ee457d092c07b0f3a7f2bbef
parent90cd584dd356f6674bc225dedcc48aa7c4c57539 (diff)
Refresh patches to avoid breakage
After pulling from 2.6.39 changes, two patches broke, one due to just context changes, and the other one due to a change that were already merged upstream. While fixing them, I did a quilt refresh on the patches that used fuzz logic. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--backports/v2.6.31_nodename.patch21
-rw-r--r--backports/v2.6.31_vm_ops.patch123
-rw-r--r--backports/v2.6.32_kfifo.patch71
-rw-r--r--backports/v2.6.33_input_handlers_are_int.patch36
-rw-r--r--backports/v2.6.33_pvrusb2_sysfs.patch25
-rw-r--r--backports/v2.6.35_firedtv_handle_fcp.patch13
-rw-r--r--backports/v2.6.35_i2c_new_probed_device.patch53
-rw-r--r--backports/v2.6.35_work_handler.patch45
-rw-r--r--backports/v2.6.36_input_getkeycode.patch24
-rw-r--r--backports/v2.6.37_dont_use_alloc_ordered_workqueue.patch38
10 files changed, 225 insertions, 224 deletions
diff --git a/backports/v2.6.31_nodename.patch b/backports/v2.6.31_nodename.patch
index 15b6168..858be11 100644
--- a/backports/v2.6.31_nodename.patch
+++ b/backports/v2.6.31_nodename.patch
@@ -1,7 +1,11 @@
-diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
---- a/drivers/media/dvb/dvb-core/dvbdev.c
-+++ b/drivers/media/dvb/dvb-core/dvbdev.c
-@@ -449,7 +449,7 @@ static int dvb_uevent(struct device *dev
+---
+ drivers/media/dvb/dvb-core/dvbdev.c | 4 ++--
+ drivers/media/rc/rc-main.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+--- linux.orig/drivers/media/dvb/dvb-core/dvbdev.c
++++ linux/drivers/media/dvb/dvb-core/dvbdev.c
+@@ -450,7 +450,7 @@ static int dvb_uevent(struct device *dev
return 0;
}
@@ -10,7 +14,7 @@ diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dv
{
struct dvb_device *dvbdev = dev_get_drvdata(dev);
-@@ -480,7 +480,7 @@ static int __init init_dvbdev(void)
+@@ -481,7 +481,7 @@ static int __init init_dvbdev(void)
goto error;
}
dvb_class->dev_uevent = dvb_uevent;
@@ -19,10 +23,9 @@ diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dv
return 0;
error:
-diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
---- a/drivers/media/rc/rc-main.c
-+++ b/drivers/media/rc/rc-main.c
-@@ -673,14 +673,14 @@ static void ir_close(struct input_dev *i
+--- linux.orig/drivers/media/rc/rc-main.c
++++ linux/drivers/media/rc/rc-main.c
+@@ -674,14 +674,14 @@ static void ir_close(struct input_dev *i
}
/* class for /sys/class/rc */
diff --git a/backports/v2.6.31_vm_ops.patch b/backports/v2.6.31_vm_ops.patch
index e50d2a8..244280f 100644
--- a/backports/v2.6.31_vm_ops.patch
+++ b/backports/v2.6.31_vm_ops.patch
@@ -1,8 +1,22 @@
-diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
-index 55ffd60..b8d9ca6 100644
---- a/drivers/media/video/cafe_ccic.c
-+++ b/drivers/media/video/cafe_ccic.c
-@@ -1368,7 +1368,7 @@ static void cafe_v4l_vm_close(struct vm_area_struct *vma)
+---
+ drivers/media/video/cafe_ccic.c | 2 +-
+ drivers/media/video/et61x251/et61x251_core.c | 2 +-
+ drivers/media/video/gspca/gspca.c | 2 +-
+ drivers/media/video/meye.c | 2 +-
+ drivers/media/video/sn9c102/sn9c102_core.c | 2 +-
+ drivers/media/video/stk-webcam.c | 2 +-
+ drivers/media/video/uvc/uvc_queue.c | 2 +-
+ drivers/media/video/videobuf-dma-contig.c | 2 +-
+ drivers/media/video/videobuf-dma-sg.c | 2 +-
+ drivers/media/video/videobuf-vmalloc.c | 2 +-
+ drivers/media/video/videobuf2-memops.c | 4 ++--
+ drivers/media/video/zoran/zoran_driver.c | 2 +-
+ include/media/videobuf2-memops.h | 4 ++--
+ 13 files changed, 15 insertions(+), 15 deletions(-)
+
+--- linux.orig/drivers/media/video/cafe_ccic.c
++++ linux/drivers/media/video/cafe_ccic.c
+@@ -1368,7 +1368,7 @@ static void cafe_v4l_vm_close(struct vm_
mutex_unlock(&sbuf->cam->s_mutex);
}
@@ -11,11 +25,9 @@ index 55ffd60..b8d9ca6 100644
.open = cafe_v4l_vm_open,
.close = cafe_v4l_vm_close
};
-diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
-index a982750..3ad0d25 100644
---- a/drivers/media/video/et61x251/et61x251_core.c
-+++ b/drivers/media/video/et61x251/et61x251_core.c
-@@ -1499,7 +1499,7 @@ static void et61x251_vm_close(struct vm_area_struct* vma)
+--- linux.orig/drivers/media/video/et61x251/et61x251_core.c
++++ linux/drivers/media/video/et61x251/et61x251_core.c
+@@ -1499,7 +1499,7 @@ static void et61x251_vm_close(struct vm_
}
@@ -24,11 +36,9 @@ index a982750..3ad0d25 100644
.open = et61x251_vm_open,
.close = et61x251_vm_close,
};
-diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
-index f21f2a2..0d5e677 100644
---- a/drivers/media/video/gspca/gspca.c
-+++ b/drivers/media/video/gspca/gspca.c
-@@ -107,7 +107,7 @@ static void gspca_vm_close(struct vm_area_struct *vma)
+--- linux.orig/drivers/media/video/gspca/gspca.c
++++ linux/drivers/media/video/gspca/gspca.c
+@@ -107,7 +107,7 @@ static void gspca_vm_close(struct vm_are
frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_MAPPED;
}
@@ -37,11 +47,9 @@ index f21f2a2..0d5e677 100644
.open = gspca_vm_open,
.close = gspca_vm_close,
};
-diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
-index 48d2c24..4e70832 100644
---- a/drivers/media/video/meye.c
-+++ b/drivers/media/video/meye.c
-@@ -1598,7 +1598,7 @@ static void meye_vm_close(struct vm_area_struct *vma)
+--- linux.orig/drivers/media/video/meye.c
++++ linux/drivers/media/video/meye.c
+@@ -1593,7 +1593,7 @@ static void meye_vm_close(struct vm_area
meye.vma_use_count[idx]--;
}
@@ -50,11 +58,9 @@ index 48d2c24..4e70832 100644
.open = meye_vm_open,
.close = meye_vm_close,
};
-diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
-index ce56a1c..cc091b2 100644
---- a/drivers/media/video/sn9c102/sn9c102_core.c
-+++ b/drivers/media/video/sn9c102/sn9c102_core.c
-@@ -2078,7 +2078,7 @@ static void sn9c102_vm_close(struct vm_area_struct* vma)
+--- linux.orig/drivers/media/video/sn9c102/sn9c102_core.c
++++ linux/drivers/media/video/sn9c102/sn9c102_core.c
+@@ -2078,7 +2078,7 @@ static void sn9c102_vm_close(struct vm_a
}
@@ -63,11 +69,9 @@ index ce56a1c..cc091b2 100644
.open = sn9c102_vm_open,
.close = sn9c102_vm_close,
};
-diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
-index d1a2cef..b24988a 100644
---- a/drivers/media/video/stk-webcam.c
-+++ b/drivers/media/video/stk-webcam.c
-@@ -672,7 +672,7 @@ static void stk_v4l_vm_close(struct vm_area_struct *vma)
+--- linux.orig/drivers/media/video/stk-webcam.c
++++ linux/drivers/media/video/stk-webcam.c
+@@ -672,7 +672,7 @@ static void stk_v4l_vm_close(struct vm_a
if (sbuf->mapcount == 0)
sbuf->v4lbuf.flags &= ~V4L2_BUF_FLAG_MAPPED;
}
@@ -76,11 +80,9 @@ index d1a2cef..b24988a 100644
.open = stk_v4l_vm_open,
.close = stk_v4l_vm_close
};
-diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c
-index f14581b..f628414 100644
---- a/drivers/media/video/uvc/uvc_queue.c
-+++ b/drivers/media/video/uvc/uvc_queue.c
-@@ -394,7 +394,7 @@ static void uvc_vm_close(struct vm_area_struct *vma)
+--- linux.orig/drivers/media/video/uvc/uvc_queue.c
++++ linux/drivers/media/video/uvc/uvc_queue.c
+@@ -394,7 +394,7 @@ static void uvc_vm_close(struct vm_area_
buffer->vma_use_count--;
}
@@ -89,11 +91,9 @@ index f14581b..f628414 100644
.open = uvc_vm_open,
.close = uvc_vm_close,
};
-diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c
-index c969111..2411516 100644
---- a/drivers/media/video/videobuf-dma-contig.c
-+++ b/drivers/media/video/videobuf-dma-contig.c
-@@ -106,7 +106,7 @@ static void videobuf_vm_close(struct vm_area_struct *vma)
+--- linux.orig/drivers/media/video/videobuf-dma-contig.c
++++ linux/drivers/media/video/videobuf-dma-contig.c
+@@ -106,7 +106,7 @@ static void videobuf_vm_close(struct vm_
}
}
@@ -102,11 +102,9 @@ index c969111..2411516 100644
.open = videobuf_vm_open,
.close = videobuf_vm_close,
};
-diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
-index ddb8f4b..3ef135a 100644
---- a/drivers/media/video/videobuf-dma-sg.c
-+++ b/drivers/media/video/videobuf-dma-sg.c
-@@ -402,7 +402,7 @@ static int videobuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+--- linux.orig/drivers/media/video/videobuf-dma-sg.c
++++ linux/drivers/media/video/videobuf-dma-sg.c
+@@ -402,7 +402,7 @@ static int videobuf_vm_fault(struct vm_a
return 0;
}
@@ -115,11 +113,9 @@ index ddb8f4b..3ef135a 100644
.open = videobuf_vm_open,
.close = videobuf_vm_close,
.fault = videobuf_vm_fault,
-diff --git a/drivers/media/video/videobuf-vmalloc.c b/drivers/media/video/videobuf-vmalloc.c
-index df14258..9b9631f 100644
---- a/drivers/media/video/videobuf-vmalloc.c
-+++ b/drivers/media/video/videobuf-vmalloc.c
-@@ -120,7 +120,7 @@ static void videobuf_vm_close(struct vm_area_struct *vma)
+--- linux.orig/drivers/media/video/videobuf-vmalloc.c
++++ linux/drivers/media/video/videobuf-vmalloc.c
+@@ -120,7 +120,7 @@ static void videobuf_vm_close(struct vm_
return;
}
@@ -128,11 +124,9 @@ index df14258..9b9631f 100644
.open = videobuf_vm_open,
.close = videobuf_vm_close,
};
-diff --git a/drivers/media/video/videobuf2-memops.c b/drivers/media/video/videobuf2-memops.c
-index a3eb656..e479bc2 100644
---- a/drivers/media/video/videobuf2-memops.c
-+++ b/drivers/media/video/videobuf2-memops.c
-@@ -156,7 +156,7 @@ EXPORT_SYMBOL_GPL(vb2_get_contig_userptr);
+--- linux.orig/drivers/media/video/videobuf2-memops.c
++++ linux/drivers/media/video/videobuf2-memops.c
+@@ -155,7 +155,7 @@ EXPORT_SYMBOL_GPL(vb2_get_contig_userptr
*/
int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr,
unsigned long size,
@@ -141,7 +135,7 @@ index a3eb656..e479bc2 100644
void *priv)
{
int ret;
-@@ -224,7 +224,7 @@ static void vb2_common_vm_close(struct vm_area_struct *vma)
+@@ -223,7 +223,7 @@ static void vb2_common_vm_close(struct v
* vb2_common_vm_ops - common vm_ops used for tracking refcount of mmaped
* video buffers
*/
@@ -150,11 +144,9 @@ index a3eb656..e479bc2 100644
.open = vb2_common_vm_open,
.close = vb2_common_vm_close,
};
-diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
-index 7c3921d..40a4cd3 100644
---- a/drivers/media/video/zoran/zoran_driver.c
-+++ b/drivers/media/video/zoran/zoran_driver.c
-@@ -2850,7 +2850,7 @@ zoran_vm_close (struct vm_area_struct *vma)
+--- linux.orig/drivers/media/video/zoran/zoran_driver.c
++++ linux/drivers/media/video/zoran/zoran_driver.c
+@@ -2850,7 +2850,7 @@ zoran_vm_close (struct vm_area_struct *v
mutex_unlock(&zr->resource_lock);
}
@@ -163,13 +155,8 @@ index 7c3921d..40a4cd3 100644
.open = zoran_vm_open,
.close = zoran_vm_close,
};
-diff --git a/drivers/staging/vme/bridges/Module.symvers b/drivers/staging/vme/bridges/Module.symvers
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/include/media/videobuf2-memops.h b/include/media/videobuf2-memops.h
-index fee1703..3e83625 100644
---- a/include/media/videobuf2-memops.h
-+++ b/include/media/videobuf2-memops.h
+--- linux.orig/include/media/videobuf2-memops.h
++++ linux/include/media/videobuf2-memops.h
@@ -28,14 +28,14 @@ struct vb2_vmarea_handler {
void *arg;
};
diff --git a/backports/v2.6.32_kfifo.patch b/backports/v2.6.32_kfifo.patch
index f985bee..10075b9 100644
--- a/backports/v2.6.32_kfifo.patch
+++ b/backports/v2.6.32_kfifo.patch
@@ -1,6 +1,15 @@
-diff -r c4cd3d2e5902 drivers/media/rc/rc-core-priv.h
---- a/drivers/media/rc/rc-core-priv.h Mon Nov 29 08:40:01 2010 -0200
-+++ b/drivers/media/rc/rc-core-priv.h Mon Nov 29 08:42:43 2010 -0200
+---
+ drivers/media/rc/ir-raw.c | 14 +++----
+ drivers/media/rc/rc-core-priv.h | 2 -
+ drivers/media/video/cx23885/cx23888-ir.c | 33 ++++++-----------
+ drivers/media/video/cx25840/cx25840-ir.c | 28 +++++---------
+ drivers/media/video/meye.c | 60 ++++++++++++++-----------------
+ drivers/media/video/meye.h | 4 +-
+ include/media/lirc_dev.h | 50 +++++++++----------------
+ 7 files changed, 79 insertions(+), 112 deletions(-)
+
+--- linux.orig/drivers/media/rc/rc-core-priv.h
++++ linux/drivers/media/rc/rc-core-priv.h
@@ -35,7 +35,7 @@ struct ir_raw_event_ctrl {
struct list_head list; /* to keep track of raw clients */
struct task_struct *thread;
@@ -10,9 +19,8 @@ diff -r c4cd3d2e5902 drivers/media/rc/rc-core-priv.h
ktime_t last_event; /* when last event occurred */
enum raw_event_type last_type; /* last event type */
struct rc_dev *dev; /* pointer to the parent rc_dev */
-diff -r c4cd3d2e5902 drivers/media/rc/ir-raw.c
---- a/drivers/media/rc/ir-raw.c Mon Nov 29 08:40:01 2010 -0200
-+++ b/drivers/media/rc/ir-raw.c Mon Nov 29 08:42:43 2010 -0200
+--- linux.orig/drivers/media/rc/ir-raw.c
++++ linux/drivers/media/rc/ir-raw.c
@@ -44,7 +44,7 @@ static int ir_raw_event_thread(void *dat
while (!kthread_should_stop()) {
@@ -31,7 +39,7 @@ diff -r c4cd3d2e5902 drivers/media/rc/ir-raw.c
return -ENOMEM;
return 0;
-@@ -259,11 +259,11 @@ int ir_raw_event_register(struct rc_dev
+@@ -258,11 +258,11 @@ int ir_raw_event_register(struct rc_dev
dev->raw->dev = dev;
dev->raw->enabled_protocols = ~0;
@@ -47,7 +55,7 @@ diff -r c4cd3d2e5902 drivers/media/rc/ir-raw.c
spin_lock_init(&dev->raw->lock);
dev->raw->thread = kthread_run(ir_raw_event_thread, dev->raw,
-@@ -305,7 +305,7 @@ void ir_raw_event_unregister(struct rc_d
+@@ -304,7 +304,7 @@ void ir_raw_event_unregister(struct rc_d
handler->raw_unregister(dev);
mutex_unlock(&ir_raw_handler_lock);
@@ -56,9 +64,8 @@ diff -r c4cd3d2e5902 drivers/media/rc/ir-raw.c
kfree(dev->raw);
dev->raw = NULL;
}
-diff -r c4cd3d2e5902 drivers/media/video/cx23885/cx23888-ir.c
---- a/drivers/media/video/cx23885/cx23888-ir.c Mon Nov 29 08:40:01 2010 -0200
-+++ b/drivers/media/video/cx23885/cx23888-ir.c Mon Nov 29 08:42:43 2010 -0200
+--- linux.orig/drivers/media/video/cx23885/cx23888-ir.c
++++ linux/drivers/media/video/cx23885/cx23888-ir.c
@@ -138,7 +138,7 @@ struct cx23888_ir_state {
atomic_t rxclk_divider;
atomic_t rx_invert;
@@ -156,9 +163,8 @@ diff -r c4cd3d2e5902 drivers/media/video/cx23885/cx23888-ir.c
kfree(state);
/* Nothing more to free() as state held the actual v4l2_subdev object */
return 0;
-diff -r c4cd3d2e5902 drivers/media/video/cx25840/cx25840-ir.c
---- a/drivers/media/video/cx25840/cx25840-ir.c Mon Nov 29 08:40:01 2010 -0200
-+++ b/drivers/media/video/cx25840/cx25840-ir.c Mon Nov 29 08:42:43 2010 -0200
+--- linux.orig/drivers/media/video/cx25840/cx25840-ir.c
++++ linux/drivers/media/video/cx25840/cx25840-ir.c
@@ -116,7 +116,7 @@ struct cx25840_ir_state {
atomic_t rxclk_divider;
atomic_t rx_invert;
@@ -244,9 +250,8 @@ diff -r c4cd3d2e5902 drivers/media/video/cx25840/cx25840-ir.c
kfree(ir_state);
state->ir_state = NULL;
return 0;
-diff -r c4cd3d2e5902 drivers/media/video/meye.c
---- a/drivers/media/video/meye.c Mon Nov 29 08:40:01 2010 -0200
-+++ b/drivers/media/video/meye.c Mon Nov 29 08:42:43 2010 -0200
+--- linux.orig/drivers/media/video/meye.c
++++ linux/drivers/media/video/meye.c
@@ -802,8 +802,8 @@ again:
return IRQ_HANDLED;
@@ -366,7 +371,7 @@ diff -r c4cd3d2e5902 drivers/media/video/meye.c
for (i = 0; i < MEYE_MAX_BUFNBRS; i++)
meye.grab_buffer[i].state = MEYE_BUF_UNUSED;
-@@ -1580,7 +1574,7 @@ static unsigned int meye_poll(struct fil
+@@ -1581,7 +1575,7 @@ static unsigned int meye_poll(struct fil
mutex_lock(&meye.lock);
poll_wait(file, &meye.proc_list, wait);
@@ -375,7 +380,7 @@ diff -r c4cd3d2e5902 drivers/media/video/meye.c
res = POLLIN | POLLRDNORM;
mutex_unlock(&meye.lock);
return res;
-@@ -1759,14 +1753,16 @@ static int __devinit meye_probe(struct p
+@@ -1760,14 +1754,16 @@ static int __devinit meye_probe(struct p
}
spin_lock_init(&meye.grabq_lock);
@@ -396,7 +401,7 @@ diff -r c4cd3d2e5902 drivers/media/video/meye.c
v4l2_err(v4l2_dev, "fifo allocation failed\n");
goto outkfifoalloc2;
}
-@@ -1877,9 +1873,9 @@ outregions:
+@@ -1878,9 +1874,9 @@ outregions:
outenabledev:
sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 0);
outsonypienable:
@@ -408,7 +413,7 @@ diff -r c4cd3d2e5902 drivers/media/video/meye.c
outkfifoalloc1:
vfree(meye.grab_temp);
outvmalloc:
-@@ -1910,8 +1906,8 @@ static void __devexit meye_remove(struct
+@@ -1911,8 +1907,8 @@ static void __devexit meye_remove(struct
sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 0);
@@ -419,9 +424,8 @@ diff -r c4cd3d2e5902 drivers/media/video/meye.c
vfree(meye.grab_temp);
-diff -r c4cd3d2e5902 drivers/media/video/meye.h
---- a/drivers/media/video/meye.h Mon Nov 29 08:40:01 2010 -0200
-+++ b/drivers/media/video/meye.h Mon Nov 29 08:42:43 2010 -0200
+--- linux.orig/drivers/media/video/meye.h
++++ linux/drivers/media/video/meye.h
@@ -304,9 +304,9 @@ struct meye {
struct meye_grab_buffer grab_buffer[MEYE_MAX_BUFNBRS];
int vma_use_count[MEYE_MAX_BUFNBRS]; /* mmap count */
@@ -434,9 +438,8 @@ diff -r c4cd3d2e5902 drivers/media/video/meye.h
spinlock_t doneq_lock; /* lock protecting the queue */
wait_queue_head_t proc_list; /* wait queue */
struct video_device *vdev; /* video device parameters */
-diff -r c4cd3d2e5902 include/media/lirc_dev.h
---- a/include/media/lirc_dev.h Mon Nov 29 08:40:01 2010 -0200
-+++ b/include/media/lirc_dev.h Mon Nov 29 08:42:43 2010 -0200
+--- linux.orig/include/media/lirc_dev.h
++++ linux/include/media/lirc_dev.h
@@ -28,19 +28,15 @@ struct lirc_buffer {
unsigned int size; /* in chunks */
/* Using chunks instead of bytes pretends to simplify boundary checking
@@ -513,13 +516,13 @@ diff -r c4cd3d2e5902 include/media/lirc_dev.h
unsigned char *dest)
{
- unsigned int ret = 0;
-+ if (lirc_buffer_len(buf) >= buf->chunk_size)
-+ kfifo_get(buf->fifo, dest, buf->chunk_size);
-
-- if (lirc_buffer_len(buf) >= buf->chunk_size)
+-
+ if (lirc_buffer_len(buf) >= buf->chunk_size)
- ret = kfifo_out_locked(&buf->fifo, dest, buf->chunk_size,
- &buf->fifo_lock);
- return ret;
++ kfifo_get(buf->fifo, dest, buf->chunk_size);
++
+ return 0;
}
@@ -528,11 +531,11 @@ diff -r c4cd3d2e5902 include/media/lirc_dev.h
unsigned char *orig)
{
- unsigned int ret;
-+ kfifo_put(buf->fifo, orig, buf->chunk_size);
-
+-
- ret = kfifo_in_locked(&buf->fifo, orig, buf->chunk_size,
- &buf->fifo_lock);
--
++ kfifo_put(buf->fifo, orig, buf->chunk_size);
+
- return ret;
+ return 0;
}
diff --git a/backports/v2.6.33_input_handlers_are_int.patch b/backports/v2.6.33_input_handlers_are_int.patch
index 1e80439..2c4f15a 100644
--- a/backports/v2.6.33_input_handlers_are_int.patch
+++ b/backports/v2.6.33_input_handlers_are_int.patch
@@ -1,6 +1,10 @@
-diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
---- a/drivers/media/rc/rc-main.c
-+++ b/drivers/media/rc/rc-main.c
+---
+ drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 5 ++---
+ drivers/media/rc/rc-main.c | 4 ++--
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+--- linux.orig/drivers/media/rc/rc-main.c
++++ linux/drivers/media/rc/rc-main.c
@@ -318,7 +318,7 @@ static unsigned int ir_establish_scancod
* This routine is used to handle evdev EVIOCSKEY ioctl.
*/
@@ -9,8 +13,8 @@ diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
+ int scancode, int keycode)
{
struct rc_dev *rdev = input_get_drvdata(idev);
- struct ir_scancode_table *rc_tab = &rdev->rc_tab;
-@@ -423,7 +423,7 @@ static unsigned int ir_lookup_by_scancod
+ struct rc_map *rc_map = &rdev->rc_map;
+@@ -422,7 +422,7 @@ static unsigned int ir_lookup_by_scancod
* This routine is used to handle evdev EVIOCGKEY ioctl.
*/
static int ir_getkeycode(struct input_dev *idev,
@@ -18,25 +22,25 @@ diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
+ int scancode, int *keycode)
{
struct rc_dev *rdev = input_get_drvdata(idev);
- struct ir_scancode_table *rc_tab = &rdev->rc_tab;
-diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
---- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
-+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
-@@ -9,7 +9,7 @@
- #include <linux/usb/input.h>
+ struct rc_map *rc_map = &rdev->rc_map;
+--- linux.orig/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
++++ linux/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+@@ -42,7 +42,7 @@ legacy_dvb_usb_get_keymap_index(const st
+ }
static int legacy_dvb_usb_getkeycode(struct input_dev *dev,
-- unsigned int scancode, unsigned int *keycode)
+- struct input_keymap_entry *ke)
+ int scancode, int *keycode)
{
struct dvb_usb_device *d = input_get_drvdata(dev);
-
-@@ -39,7 +39,7 @@ static int legacy_dvb_usb_getkeycode(str
+ struct rc_map_table *keymap = d->props.rc.legacy.rc_map_table;
+@@ -64,8 +64,7 @@ static int legacy_dvb_usb_getkeycode(str
}
static int legacy_dvb_usb_setkeycode(struct input_dev *dev,
-- unsigned int scancode, unsigned int keycode)
+- const struct input_keymap_entry *ke,
+- unsigned int *old_keycode)
+ int scancode, int keycode)
{
struct dvb_usb_device *d = input_get_drvdata(dev);
-
+ struct rc_map_table *keymap = d->props.rc.legacy.rc_map_table;
diff --git a/backports/v2.6.33_pvrusb2_sysfs.patch b/backports/v2.6.33_pvrusb2_sysfs.patch
index 3e9319c..0485a35 100644
--- a/backports/v2.6.33_pvrusb2_sysfs.patch
+++ b/backports/v2.6.33_pvrusb2_sysfs.patch
@@ -1,7 +1,10 @@
-diff -r 5254948f88c4 drivers/media/video/pvrusb2/pvrusb2-sysfs.c
---- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c Sun Oct 17 19:59:28 2010 -0200
-+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c Sun Oct 17 20:09:02 2010 -0200
-@@ -423,12 +423,10 @@
+---
+ drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+--- linux.orig/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
++++ linux/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+@@ -432,12 +432,10 @@ static void pvr2_sysfs_add_debugifc(stru
dip = kzalloc(sizeof(*dip),GFP_KERNEL);
if (!dip) return;
@@ -14,8 +17,8 @@ diff -r 5254948f88c4 drivers/media/video/pvrusb2/pvrusb2-sysfs.c
dip->attr_debuginfo.attr.name = "debuginfo";
dip->attr_debuginfo.attr.mode = S_IRUGO;
dip->attr_debuginfo.show = debuginfo_show;
-@@ -650,8 +648,6 @@
- kfree(class_dev);
+@@ -659,8 +657,6 @@ static void class_dev_create(struct pvr2
+ put_device(class_dev);
return;
}
-
@@ -23,7 +26,7 @@ diff -r 5254948f88c4 drivers/media/video/pvrusb2/pvrusb2-sysfs.c
sfp->attr_v4l_minor_number.attr.name = "v4l_minor_number";
sfp->attr_v4l_minor_number.attr.mode = S_IRUGO;
sfp->attr_v4l_minor_number.show = v4l_minor_number_show;
-@@ -665,8 +661,6 @@
+@@ -674,8 +670,6 @@ static void class_dev_create(struct pvr2
} else {
sfp->v4l_minor_number_created_ok = !0;
}
@@ -32,7 +35,7 @@ diff -r 5254948f88c4 drivers/media/video/pvrusb2/pvrusb2-sysfs.c
sfp->attr_v4l_radio_minor_number.attr.name = "v4l_radio_minor_number";
sfp->attr_v4l_radio_minor_number.attr.mode = S_IRUGO;
sfp->attr_v4l_radio_minor_number.show = v4l_radio_minor_number_show;
-@@ -680,8 +674,6 @@
+@@ -689,8 +683,6 @@ static void class_dev_create(struct pvr2
} else {
sfp->v4l_radio_minor_number_created_ok = !0;
}
@@ -41,7 +44,7 @@ diff -r 5254948f88c4 drivers/media/video/pvrusb2/pvrusb2-sysfs.c
sfp->attr_unit_number.attr.name = "unit_number";
sfp->attr_unit_number.attr.mode = S_IRUGO;
sfp->attr_unit_number.show = unit_number_show;
-@@ -694,8 +686,6 @@
+@@ -703,8 +695,6 @@ static void class_dev_create(struct pvr2
} else {
sfp->unit_number_created_ok = !0;
}
@@ -50,7 +53,7 @@ diff -r 5254948f88c4 drivers/media/video/pvrusb2/pvrusb2-sysfs.c
sfp->attr_bus_info.attr.name = "bus_info_str";
sfp->attr_bus_info.attr.mode = S_IRUGO;
sfp->attr_bus_info.show = bus_info_show;
-@@ -709,8 +699,6 @@
+@@ -718,8 +708,6 @@ static void class_dev_create(struct pvr2
} else {
sfp->bus_info_created_ok = !0;
}
@@ -59,7 +62,7 @@ diff -r 5254948f88c4 drivers/media/video/pvrusb2/pvrusb2-sysfs.c
sfp->attr_hdw_name.attr.name = "device_hardware_type";
sfp->attr_hdw_name.attr.mode = S_IRUGO;
sfp->attr_hdw_name.show = hdw_name_show;
-@@ -724,8 +712,6 @@
+@@ -733,8 +721,6 @@ static void class_dev_create(struct pvr2
} else {
sfp->hdw_name_created_ok = !0;
}
diff --git a/backports/v2.6.35_firedtv_handle_fcp.patch b/backports/v2.6.35_firedtv_handle_fcp.patch
index 89d03f4..a7ad4e5 100644
--- a/backports/v2.6.35_firedtv_handle_fcp.patch
+++ b/backports/v2.6.35_firedtv_handle_fcp.patch
@@ -1,8 +1,11 @@
-diff -r 22cb011c456d drivers/media/dvb/firewire/firedtv-fw.c
---- a/drivers/media/dvb/firewire/firedtv-fw.c Tue Oct 26 14:18:02 2010 -0200
-+++ b/drivers/media/dvb/firewire/firedtv-fw.c Wed Oct 27 21:35:30 2010 -0200
-@@ -193,9 +193,9 @@
- };
+---
+ drivers/media/dvb/firewire/firedtv-fw.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- linux.orig/drivers/media/dvb/firewire/firedtv-fw.c
++++ linux/drivers/media/dvb/firewire/firedtv-fw.c
+@@ -192,9 +192,9 @@ void fdtv_stop_iso(struct firedtv *fdtv)
+ }
static void handle_fcp(struct fw_card *card, struct fw_request *request,
- int tcode, int destination, int source, int generation,
diff --git a/backports/v2.6.35_i2c_new_probed_device.patch b/backports/v2.6.35_i2c_new_probed_device.patch
index de8d48f..d998814 100644
--- a/backports/v2.6.35_i2c_new_probed_device.patch
+++ b/backports/v2.6.35_i2c_new_probed_device.patch
@@ -1,7 +1,15 @@
-diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
---- a/drivers/media/video/bt8xx/bttv-input.c
-+++ b/drivers/media/video/bt8xx/bttv-input.c
-@@ -401,7 +401,7 @@ void __devinit init_bttv_i2c_ir(struct b
+---
+ drivers/media/video/bt8xx/bttv-input.c | 2 +-
+ drivers/media/video/cx18/cx18-i2c.c | 2 +-
+ drivers/media/video/cx23885/cx23885-i2c.c | 5 +++--
+ drivers/media/video/em28xx/em28xx-cards.c | 2 +-
+ drivers/media/video/ivtv/ivtv-i2c.c | 6 +++---
+ drivers/media/video/v4l2-common.c | 3 +--
+ 6 files changed, 10 insertions(+), 10 deletions(-)
+
+--- linux.orig/drivers/media/video/bt8xx/bttv-input.c
++++ linux/drivers/media/video/bt8xx/bttv-input.c
+@@ -399,7 +399,7 @@ void __devinit init_bttv_i2c_ir(struct b
* That's why we probe 0x1a (~0x34) first. CB
*/
@@ -10,9 +18,8 @@ diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/
return;
}
-diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
---- a/drivers/media/video/cx18/cx18-i2c.c
-+++ b/drivers/media/video/cx18/cx18-i2c.c
+--- linux.orig/drivers/media/video/cx18/cx18-i2c.c
++++ linux/drivers/media/video/cx18/cx18-i2c.c
@@ -104,7 +104,7 @@ static int cx18_i2c_new_ir(struct cx18 *
break;
}
@@ -22,10 +29,9 @@ diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18
-1 : 0;
}
-diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c
---- a/drivers/media/video/cx23885/cx23885-i2c.c
-+++ b/drivers/media/video/cx23885/cx23885-i2c.c
-@@ -354,7 +354,8 @@ int cx23885_i2c_register(struct cx23885_
+--- linux.orig/drivers/media/video/cx23885/cx23885-i2c.c
++++ linux/drivers/media/video/cx23885/cx23885-i2c.c
+@@ -344,7 +344,8 @@ int cx23885_i2c_register(struct cx23885_
} else
printk(KERN_WARNING "%s: i2c bus %d register FAILED\n",
dev->name, bus->nr);
@@ -35,7 +41,7 @@ diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx2
/* Instantiate the IR receiver device, if present */
if (0 == bus->i2c_rc) {
struct i2c_board_info info;
-@@ -369,7 +370,7 @@ int cx23885_i2c_register(struct cx23885_
+@@ -359,7 +360,7 @@ int cx23885_i2c_register(struct cx23885_
i2c_new_probed_device(&bus->i2c_adap, &info, addr_list,
i2c_probe_func_quick_read);
}
@@ -44,10 +50,9 @@ diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx2
return bus->i2c_rc;
}
-diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
---- a/drivers/media/video/em28xx/em28xx-cards.c
-+++ b/drivers/media/video/em28xx/em28xx-cards.c
-@@ -2446,7 +2446,7 @@ void em28xx_register_i2c_ir(struct em28x
+--- linux.orig/drivers/media/video/em28xx/em28xx-cards.c
++++ linux/drivers/media/video/em28xx/em28xx-cards.c
+@@ -2454,7 +2454,7 @@ void em28xx_register_i2c_ir(struct em28x
if (dev->init_data.name)
info.platform_data = &dev->init_data;
@@ -56,9 +61,8 @@ diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em2
}
void em28xx_card_setup(struct em28xx *dev)
-diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
---- a/drivers/media/video/ivtv/ivtv-i2c.c
-+++ b/drivers/media/video/ivtv/ivtv-i2c.c
+--- linux.orig/drivers/media/video/ivtv/ivtv-i2c.c
++++ linux/drivers/media/video/ivtv/ivtv-i2c.c
@@ -186,7 +186,7 @@ static int ivtv_i2c_new_ir(struct ivtv *
return -1;
memset(&info, 0, sizeof(struct i2c_board_info));
@@ -68,7 +72,7 @@ diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv
== NULL ? -1 : 0;
}
-@@ -231,7 +231,7 @@ static int ivtv_i2c_new_ir(struct ivtv *
+@@ -230,7 +230,7 @@ static int ivtv_i2c_new_ir(struct ivtv *
info.platform_data = init_data;
strlcpy(info.type, type, I2C_NAME_SIZE);
@@ -77,7 +81,7 @@ diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv
-1 : 0;
}
-@@ -258,7 +258,7 @@ struct i2c_client *ivtv_i2c_new_ir_legac
+@@ -257,7 +257,7 @@ struct i2c_client *ivtv_i2c_new_ir_legac
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
@@ -86,10 +90,9 @@ diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv
}
int ivtv_i2c_register(struct ivtv *itv, unsigned idx)
-diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
---- a/drivers/media/video/v4l2-common.c
-+++ b/drivers/media/video/v4l2-common.c
-@@ -380,8 +380,7 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_
+--- linux.orig/drivers/media/video/v4l2-common.c
++++ linux/drivers/media/video/v4l2-common.c
+@@ -316,8 +316,7 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_
/* Create the i2c client */
if (info->addr == 0 && probe_addrs)
diff --git a/backports/v2.6.35_work_handler.patch b/backports/v2.6.35_work_handler.patch
index 78a8e2a..caad9c5 100644
--- a/backports/v2.6.35_work_handler.patch
+++ b/backports/v2.6.35_work_handler.patch
@@ -1,7 +1,13 @@
-diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-driver.c
---- a/drivers/media/video/ivtv/ivtv-driver.c Tue Oct 26 23:13:59 2010 -0200
-+++ b/drivers/media/video/ivtv/ivtv-driver.c Tue Oct 26 23:16:20 2010 -0200
-@@ -706,8 +706,6 @@
+---
+ drivers/media/video/ivtv/ivtv-driver.c | 26 ++++++++++----------------
+ drivers/media/video/ivtv/ivtv-driver.h | 8 ++++----
+ drivers/media/video/ivtv/ivtv-irq.c | 15 ++++++++++++---
+ drivers/media/video/ivtv/ivtv-irq.h | 2 +-
+ 4 files changed, 27 insertions(+), 24 deletions(-)
+
+--- linux.orig/drivers/media/video/ivtv/ivtv-driver.c
++++ linux/drivers/media/video/ivtv/ivtv-driver.c
+@@ -706,8 +706,6 @@ done:
*/
static int __devinit ivtv_init_struct1(struct ivtv *itv)
{
@@ -10,7 +16,7 @@ diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-driver.c
itv->base_addr = pci_resource_start(itv->pdev, 0);
itv->enc_mbox.max_mbox = 2; /* the encoder has 3 mailboxes (0-2) */
itv->dec_mbox.max_mbox = 1; /* the decoder has 2 mailboxes (0-1) */
-@@ -719,17 +717,13 @@
+@@ -719,17 +717,13 @@ static int __devinit ivtv_init_struct1(s
spin_lock_init(&itv->lock);
spin_lock_init(&itv->dma_reg_lock);
@@ -32,7 +38,7 @@ diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-driver.c
/* start counting open_id at 1 */
itv->open_id = 1;
-@@ -1019,7 +1013,7 @@
+@@ -1017,7 +1011,7 @@ static int __devinit ivtv_probe(struct p
/* PCI Device Setup */
retval = ivtv_setup_pci(itv, pdev, pci_id);
if (retval == -EIO)
@@ -41,7 +47,7 @@ diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-driver.c
if (retval == -ENXIO)
goto free_mem;
-@@ -1231,8 +1225,8 @@
+@@ -1245,8 +1239,8 @@ free_mem:
release_mem_region(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
if (itv->has_cx23415)
release_mem_region(itv->base_addr + IVTV_DECODER_OFFSET, IVTV_DECODER_SIZE);
@@ -52,7 +58,7 @@ diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-driver.c
err:
if (retval == 0)
retval = -ENODEV;
-@@ -1371,9 +1365,9 @@
+@@ -1385,9 +1379,9 @@ static void ivtv_remove(struct pci_dev *
ivtv_set_irq_mask(itv, 0xffffffff);
del_timer_sync(&itv->dma_timer);
@@ -65,9 +71,8 @@ diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-driver.c
ivtv_streams_cleanup(itv, 1);
ivtv_udma_free(itv);
-diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-driver.h
---- a/drivers/media/video/ivtv/ivtv-driver.h Tue Oct 26 23:13:59 2010 -0200
-+++ b/drivers/media/video/ivtv/ivtv-driver.h Tue Oct 26 23:16:20 2010 -0200
+--- linux.orig/drivers/media/video/ivtv/ivtv-driver.h
++++ linux/drivers/media/video/ivtv/ivtv-driver.h
@@ -51,7 +51,7 @@
#include <linux/unistd.h>
#include <linux/pagemap.h>
@@ -77,7 +82,7 @@ diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-driver.h
#include <linux/mutex.h>
#include <linux/slab.h>
#include <asm/uaccess.h>
-@@ -261,6 +261,7 @@
+@@ -261,6 +261,7 @@ struct ivtv_mailbox_data {
#define IVTV_F_I_DEC_PAUSED 20 /* the decoder is paused */
#define IVTV_F_I_INITED 21 /* set after first open */
#define IVTV_F_I_FAILED 22 /* set if first open failed */
@@ -85,7 +90,7 @@ diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-driver.h
/* Event notifications */
#define IVTV_F_I_EV_DEC_STOPPED 28 /* decoder stopped event */
-@@ -667,9 +668,8 @@
+@@ -666,9 +667,8 @@ struct ivtv {
/* Interrupts & DMA */
u32 irqmask; /* active interrupts */
u32 irq_rr_idx; /* round-robin stream index */
@@ -97,10 +102,9 @@ diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-driver.h
spinlock_t dma_reg_lock; /* lock access to DMA engine registers */
int cur_dma_stream; /* index of current stream doing DMA (-1 if none) */
int cur_pio_stream; /* index of current stream doing PIO (-1 if none) */
-diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-irq.c
---- a/drivers/media/video/ivtv/ivtv-irq.c Tue Oct 26 23:13:59 2010 -0200
-+++ b/drivers/media/video/ivtv/ivtv-irq.c Tue Oct 26 23:16:20 2010 -0200
-@@ -71,10 +71,19 @@
+--- linux.orig/drivers/media/video/ivtv/ivtv-irq.c
++++ linux/drivers/media/video/ivtv/ivtv-irq.c
+@@ -71,10 +71,19 @@ static void ivtv_pio_work_handler(struct
write_reg(IVTV_IRQ_ENC_PIO_COMPLETE, 0x44);
}
@@ -122,7 +126,7 @@ diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-irq.c
if (test_and_clear_bit(IVTV_F_I_WORK_HANDLER_PIO, &itv->i_flags))
ivtv_pio_work_handler(itv);
-@@ -966,7 +975,7 @@
+@@ -1010,7 +1019,7 @@ irqreturn_t ivtv_irq_handler(int irq, vo
}
if (test_and_clear_bit(IVTV_F_I_HAVE_WORK, &itv->i_flags)) {
@@ -131,9 +135,8 @@ diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-irq.c
}
spin_unlock(&itv->dma_reg_lock);
-diff -r a14b248a9a18 drivers/media/video/ivtv/ivtv-irq.h
---- a/drivers/media/video/ivtv/ivtv-irq.h Tue Oct 26 23:13:59 2010 -0200
-+++ b/drivers/media/video/ivtv/ivtv-irq.h Tue Oct 26 23:16:20 2010 -0200
+--- linux.orig/drivers/media/video/ivtv/ivtv-irq.h
++++ linux/drivers/media/video/ivtv/ivtv-irq.h
@@ -46,7 +46,7 @@
irqreturn_t ivtv_irq_handler(int irq, void *dev_id);
diff --git a/backports/v2.6.36_input_getkeycode.patch b/backports/v2.6.36_input_getkeycode.patch
index 54daa95..2c405d8 100644
--- a/backports/v2.6.36_input_getkeycode.patch
+++ b/backports/v2.6.36_input_getkeycode.patch
@@ -1,7 +1,10 @@
-diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
---- a/drivers/media/rc/rc-main.c
-+++ b/drivers/media/rc/rc-main.c
-@@ -318,37 +318,23 @@
+---
+ drivers/media/rc/rc-main.c | 69 ++++++++++-----------------------------------
+ 1 file changed, 16 insertions(+), 53 deletions(-)
+
+--- linux.orig/drivers/media/rc/rc-main.c
++++ linux/drivers/media/rc/rc-main.c
+@@ -318,37 +318,23 @@ static unsigned int ir_establish_scancod
* This routine is used to handle evdev EVIOCSKEY ioctl.
*/
static int ir_setkeycode(struct input_dev *idev,
@@ -45,7 +48,7 @@ diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
out:
spin_unlock_irqrestore(&rc_map->lock, flags);
-@@ -436,48 +422,25 @@
+@@ -436,48 +422,25 @@ static unsigned int ir_lookup_by_scancod
* This routine is used to handle evdev EVIOCGKEY ioctl.
*/
static int ir_getkeycode(struct input_dev *idev,
@@ -104,14 +107,3 @@ diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
retval = 0;
-@@ -966,8 +929,8 @@
- return NULL;
- }
-
-- dev->input_dev->getkeycode_new = ir_getkeycode;
-- dev->input_dev->setkeycode_new = ir_setkeycode;
-+ dev->input_dev->getkeycode = ir_getkeycode;
-+ dev->input_dev->setkeycode = ir_setkeycode;
- input_set_drvdata(dev->input_dev, dev);
-
- spin_lock_init(&dev->rc_map.lock);
diff --git a/backports/v2.6.37_dont_use_alloc_ordered_workqueue.patch b/backports/v2.6.37_dont_use_alloc_ordered_workqueue.patch
index 5309bb1..df36507 100644
--- a/backports/v2.6.37_dont_use_alloc_ordered_workqueue.patch
+++ b/backports/v2.6.37_dont_use_alloc_ordered_workqueue.patch
@@ -1,8 +1,12 @@
-diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
-index 869690b..e712607 100644
---- a/drivers/media/video/cx18/cx18-driver.c
-+++ b/drivers/media/video/cx18/cx18-driver.c
-@@ -665,7 +665,7 @@ static int __devinit cx18_create_in_workq(struct cx18 *cx)
+---
+ drivers/media/video/cx18/cx18-driver.c | 24 ++++++++++++++++++++++--
+ drivers/media/video/cx18/cx18-driver.h | 3 +++
+ drivers/media/video/cx18/cx18-streams.h | 3 ++-
+ 3 files changed, 27 insertions(+), 3 deletions(-)
+
+--- linux.orig/drivers/media/video/cx18/cx18-driver.c
++++ linux/drivers/media/video/cx18/cx18-driver.c
+@@ -686,7 +686,7 @@ static int __devinit cx18_create_in_work
{
snprintf(cx->in_workq_name, sizeof(cx->in_workq_name), "%s-in",
cx->v4l2_dev.name);
@@ -11,7 +15,7 @@ index 869690b..e712607 100644
if (cx->in_work_queue == NULL) {
CX18_ERR("Unable to create incoming mailbox handler thread\n");
return -ENOMEM;
-@@ -673,6 +673,18 @@ static int __devinit cx18_create_in_workq(struct cx18 *cx)
+@@ -694,6 +694,18 @@ static int __devinit cx18_create_in_work
return 0;
}
@@ -30,7 +34,7 @@ index 869690b..e712607 100644
static void __devinit cx18_init_in_work_orders(struct cx18 *cx)
{
int i;
-@@ -699,10 +711,16 @@ static int __devinit cx18_init_struct1(struct cx18 *cx)
+@@ -720,10 +732,16 @@ static int __devinit cx18_init_struct1(s
mutex_init(&cx->epu2apu_mb_lock);
mutex_init(&cx->epu2cpu_mb_lock);
@@ -48,7 +52,7 @@ index 869690b..e712607 100644
cx18_init_in_work_orders(cx);
/* start counting open_id at 1 */
-@@ -1095,6 +1113,7 @@ free_mem:
+@@ -1117,6 +1135,7 @@ free_mem:
release_mem_region(cx->base_addr, CX18_MEM_SIZE);
free_workqueues:
destroy_workqueue(cx->in_work_queue);
@@ -56,7 +60,7 @@ index 869690b..e712607 100644
err:
if (retval == 0)
retval = -ENODEV;
-@@ -1246,6 +1265,7 @@ static void cx18_remove(struct pci_dev *pci_dev)
+@@ -1268,6 +1287,7 @@ static void cx18_remove(struct pci_dev *
cx18_halt_firmware(cx);
destroy_workqueue(cx->in_work_queue);
@@ -64,11 +68,9 @@ index 869690b..e712607 100644
cx18_streams_cleanup(cx, 1);
-diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
-index 26eb910..d050a0a 100644
---- a/drivers/media/video/cx18/cx18-driver.h
-+++ b/drivers/media/video/cx18/cx18-driver.h
-@@ -617,6 +617,9 @@ struct cx18 {
+--- linux.orig/drivers/media/video/cx18/cx18-driver.h
++++ linux/drivers/media/video/cx18/cx18-driver.h
+@@ -628,6 +628,9 @@ struct cx18 {
struct cx18_in_work_order in_work_order[CX18_MAX_IN_WORK_ORDERS];
char epu_debug_str[256]; /* CX18_EPU_DEBUG is rare: use shared space */
@@ -78,11 +80,9 @@ index 26eb910..d050a0a 100644
/* i2c */
struct i2c_adapter i2c_adap[2];
struct i2c_algo_bit_data i2c_algo[2];
-diff --git a/drivers/media/video/cx18/cx18-streams.h b/drivers/media/video/cx18/cx18-streams.h
-index 713b0e6..51765eb 100644
---- a/drivers/media/video/cx18/cx18-streams.h
-+++ b/drivers/media/video/cx18/cx18-streams.h
-@@ -42,7 +42,8 @@ static inline bool cx18_stream_enabled(struct cx18_stream *s)
+--- linux.orig/drivers/media/video/cx18/cx18-streams.h
++++ linux/drivers/media/video/cx18/cx18-streams.h
+@@ -42,7 +42,8 @@ static inline bool cx18_stream_enabled(s
/* Related to submission of mdls to firmware */
static inline void cx18_stream_load_fw_queue(struct cx18_stream *s)
{

Privacy Policy