rpms/kernel/F-11 kernel.spec, 1.1667, 1.1668 linux-2.6.29-lirc.patch, 1.9, 1.10
Jarod Wilson
jwilson at fedoraproject.org
Tue Jun 30 04:59:39 UTC 2009
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30862
Modified Files:
kernel.spec linux-2.6.29-lirc.patch
Log Message:
* Tue Jun 30 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.5-206
- Fix busticated lirc_serial (#504402)
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1667
retrieving revision 1.1668
diff -u -p -r1.1667 -r1.1668
--- kernel.spec 29 Jun 2009 23:43:08 -0000 1.1667
+++ kernel.spec 30 Jun 2009 04:59:08 -0000 1.1668
@@ -2083,6 +2083,9 @@ fi
# and build.
%changelog
+* Tue Jun 30 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.5-206
+- Fix busticated lirc_serial (#504402)
+
* Tue Jun 30 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.5-205
- nouveau: Forcibly DPMS on DAC/SORs during modeset
linux-2.6.29-lirc.patch:
Index: linux-2.6.29-lirc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/linux-2.6.29-lirc.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- linux-2.6.29-lirc.patch 25 Jun 2009 02:10:33 -0000 1.9
+++ linux-2.6.29-lirc.patch 30 Jun 2009 04:59:08 -0000 1.10
@@ -2,7 +2,7 @@ Linux Infrared Remote Control drivers --
From http://git.wilsonet.com/linux-2.6-lirc.git/
-Refreshed 20090624
+Refreshed 20090630
Signed-off-by: Jarod Wilson <jarod at redhat.com>
@@ -14,7 +14,7 @@ Signed-off-by: Jarod Wilson <jarod at redha
drivers/input/lirc/Makefile | 21 +
drivers/input/lirc/lirc.h | 100 ++
drivers/input/lirc/lirc_bt829.c | 383 ++++++
- drivers/input/lirc/lirc_dev.c | 850 ++++++++++++++
+ drivers/input/lirc/lirc_dev.c | 851 ++++++++++++++
drivers/input/lirc/lirc_dev.h | 184 +++
drivers/input/lirc/lirc_i2c.c | 649 +++++++++++
drivers/input/lirc/lirc_igorplugusb.c | 556 +++++++++
@@ -32,7 +32,7 @@ Signed-off-by: Jarod Wilson <jarod at redha
drivers/input/lirc/lirc_streamzap.c | 777 +++++++++++++
drivers/input/lirc/lirc_ttusbir.c | 397 +++++++
drivers/input/lirc/lirc_zilog.c | 1384 ++++++++++++++++++++++
- 25 files changed, 15260 insertions(+), 0 deletions(-)
+ 25 files changed, 15261 insertions(+), 0 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 59fd2d1..ad1b16c 100644
@@ -725,10 +725,10 @@ index 0000000..0485884
+MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git a/drivers/input/lirc/lirc_dev.c b/drivers/input/lirc/lirc_dev.c
new file mode 100644
-index 0000000..9d1630e
+index 0000000..a5d5c89
--- /dev/null
+++ b/drivers/input/lirc/lirc_dev.c
-@@ -0,0 +1,850 @@
+@@ -0,0 +1,851 @@
+/*
+ * LIRC base driver
+ *
@@ -814,6 +814,7 @@ index 0000000..9d1630e
+ */
+static void init_irctl(struct irctl *ir)
+{
++ dprintk(LOGHEAD "initializing irctl\n", ir->d.name, ir->d.minor);
+ mutex_init(&ir->buffer_lock);
+ ir->d.minor = NOPLUG;
+}
@@ -7465,7 +7466,7 @@ index 0000000..12d9723
+MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git a/drivers/input/lirc/lirc_mceusb2.c b/drivers/input/lirc/lirc_mceusb2.c
new file mode 100644
-index 0000000..897226d
+index 0000000..7c3d0b1
--- /dev/null
+++ b/drivers/input/lirc/lirc_mceusb2.c
@@ -0,0 +1,1105 @@
@@ -10260,7 +10261,7 @@ index 0000000..270f8ff
+module_exit(sasem_exit);
diff --git a/drivers/input/lirc/lirc_serial.c b/drivers/input/lirc/lirc_serial.c
new file mode 100644
-index 0000000..1b79ced
+index 0000000..d602e90
--- /dev/null
+++ b/drivers/input/lirc/lirc_serial.c
@@ -0,0 +1,1316 @@
@@ -11170,11 +11171,6 @@ index 0000000..1b79ced
+ int result;
+ unsigned long flags;
+
-+ /* Init read buffer. */
-+ result = lirc_buffer_init(&rbuf, sizeof(int), RBUF_LEN);
-+ if (result < 0)
-+ return -ENOMEM;
-+
+ /* initialize timestamp */
+ do_gettimeofday(&lasttv);
+
@@ -11185,12 +11181,10 @@ index 0000000..1b79ced
+ switch (result) {
+ case -EBUSY:
+ printk(KERN_ERR LIRC_DRIVER_NAME ": IRQ %d busy\n", irq);
-+ lirc_buffer_free(&rbuf);
+ return -EBUSY;
+ case -EINVAL:
+ printk(KERN_ERR LIRC_DRIVER_NAME
+ ": Bad irq number or handler\n");
-+ lirc_buffer_free(&rbuf);
+ return -EINVAL;
+ default:
+ dprintk("Interrupt %d, port %04x obtained\n", irq, io);
@@ -11225,7 +11219,6 @@ index 0000000..1b79ced
+ free_irq(irq, (void *)&hardware);
+
+ dprintk("freed IRQ %d\n", irq);
-+ lirc_buffer_free(&rbuf);
+}
+
+static ssize_t lirc_write(struct file *file, const char *buf,
@@ -11424,10 +11417,15 @@ index 0000000..1b79ced
+{
+ int result;
+
++ /* Init read buffer. */
++ result = lirc_buffer_init(&rbuf, sizeof(int), RBUF_LEN);
++ if (result < 0)
++ return -ENOMEM;
++
+ result = platform_driver_register(&lirc_serial_driver);
+ if (result) {
+ printk("lirc register returned %d\n", result);
-+ return result;
++ goto exit_buffer_free;
+ }
+
+ lirc_serial_dev = platform_device_alloc("lirc_serial", 0);
@@ -11446,6 +11444,8 @@ index 0000000..1b79ced
+ platform_device_put(lirc_serial_dev);
+exit_driver_unregister:
+ platform_driver_unregister(&lirc_serial_driver);
++exit_buffer_free:
++ lirc_buffer_free(&rbuf);
+ return result;
+}
+
@@ -11453,6 +11453,7 @@ index 0000000..1b79ced
+{
+ platform_device_unregister(lirc_serial_dev);
+ platform_driver_unregister(&lirc_serial_driver);
++ lirc_buffer_free(&rbuf);
+}
+
+static int __init lirc_serial_init_module(void)
More information about the fedora-extras-commits
mailing list