[kernel] r16928 - in dists/squeeze/linux-2.6/debian/patches: bugfix/all/stable debian series
Dann Frazier
dannf at alioth.debian.org
Mon Feb 21 17:03:32 UTC 2011
Author: dannf
Date: Mon Feb 21 17:03:22 2011
New Revision: 16928
Log:
use a separate patch to revert the radio-aimslab/gcc4.5 fix from 2.6.32.29
instead of editing the 2.6.32.29 patch directly
Added:
dists/squeeze/linux-2.6/debian/patches/debian/revert-radio-aimslab-gcc4.5-fix-in-2.6.32.29.patch
Modified:
dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.29.patch
dists/squeeze/linux-2.6/debian/patches/series/31
Modified: dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.29.patch
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.29.patch Mon Feb 21 16:38:33 2011 (r16927)
+++ dists/squeeze/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.29.patch Mon Feb 21 17:03:22 2011 (r16928)
@@ -792,6 +792,84 @@
rdev->raid_disk = -1;
} else
super_types[mddev->major_version].
+diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
+index 35edee0..30052db 100644
+--- a/drivers/media/radio/radio-aimslab.c
++++ b/drivers/media/radio/radio-aimslab.c
+@@ -31,7 +31,6 @@
+ #include <linux/module.h> /* Modules */
+ #include <linux/init.h> /* Initdata */
+ #include <linux/ioport.h> /* request_region */
+-#include <linux/delay.h> /* udelay */
+ #include <linux/videodev2.h> /* kernel radio structs */
+ #include <linux/version.h> /* for KERNEL_VERSION MACRO */
+ #include <linux/io.h> /* outb, outb_p */
+@@ -71,27 +70,17 @@ static struct rtrack rtrack_card;
+
+ /* local things */
+
+-static void sleep_delay(long n)
+-{
+- /* Sleep nicely for 'n' uS */
+- int d = n / msecs_to_jiffies(1000);
+- if (!d)
+- udelay(n);
+- else
+- msleep(jiffies_to_msecs(d));
+-}
+-
+ static void rt_decvol(struct rtrack *rt)
+ {
+ outb(0x58, rt->io); /* volume down + sigstr + on */
+- sleep_delay(100000);
++ msleep(100);
+ outb(0xd8, rt->io); /* volume steady + sigstr + on */
+ }
+
+ static void rt_incvol(struct rtrack *rt)
+ {
+ outb(0x98, rt->io); /* volume up + sigstr + on */
+- sleep_delay(100000);
++ msleep(100);
+ outb(0xd8, rt->io); /* volume steady + sigstr + on */
+ }
+
+@@ -120,7 +109,7 @@ static int rt_setvol(struct rtrack *rt, int vol)
+
+ if (vol == 0) { /* volume = 0 means mute the card */
+ outb(0x48, rt->io); /* volume down but still "on" */
+- sleep_delay(2000000); /* make sure it's totally down */
++ msleep(2000); /* make sure it's totally down */
+ outb(0xd0, rt->io); /* volume steady, off */
+ rt->curvol = 0; /* track the volume state! */
+ mutex_unlock(&rt->lock);
+@@ -155,7 +144,7 @@ static void send_0_byte(struct rtrack *rt)
+ outb_p(128+64+16+8+ 1, rt->io); /* on + wr-enable + data low */
+ outb_p(128+64+16+8+2+1, rt->io); /* clock */
+ }
+- sleep_delay(1000);
++ msleep(1);
+ }
+
+ static void send_1_byte(struct rtrack *rt)
+@@ -169,7 +158,7 @@ static void send_1_byte(struct rtrack *rt)
+ outb_p(128+64+16+8+4+2+1, rt->io); /* clock */
+ }
+
+- sleep_delay(1000);
++ msleep(1);
+ }
+
+ static int rt_setfreq(struct rtrack *rt, unsigned long freq)
+@@ -423,7 +412,7 @@ static int __init rtrack_init(void)
+
+ /* this ensures that the volume is all the way down */
+ outb(0x48, rt->io); /* volume down but still "on" */
+- sleep_delay(2000000); /* make sure it's totally down */
++ msleep(2000); /* make sure it's totally down */
+ outb(0xc0, rt->io); /* steady volume, mute card */
+
+ return 0;
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index c0fd5c6..331d1ec 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
Added: dists/squeeze/linux-2.6/debian/patches/debian/revert-radio-aimslab-gcc4.5-fix-in-2.6.32.29.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/squeeze/linux-2.6/debian/patches/debian/revert-radio-aimslab-gcc4.5-fix-in-2.6.32.29.patch Mon Feb 21 17:03:22 2011 (r16928)
@@ -0,0 +1,77 @@
+diff -urpN a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
+--- a/drivers/media/radio/radio-aimslab.c 2011-02-21 09:54:23.190447812 -0700
++++ b/drivers/media/radio/radio-aimslab.c 2011-02-21 09:55:45.222980990 -0700
+@@ -31,6 +31,7 @@
+ #include <linux/module.h> /* Modules */
+ #include <linux/init.h> /* Initdata */
+ #include <linux/ioport.h> /* request_region */
++#include <linux/delay.h> /* udelay */
+ #include <linux/videodev2.h> /* kernel radio structs */
+ #include <linux/version.h> /* for KERNEL_VERSION MACRO */
+ #include <linux/io.h> /* outb, outb_p */
+@@ -70,17 +71,27 @@ static struct rtrack rtrack_card;
+
+ /* local things */
+
++static void sleep_delay(long n)
++{
++ /* Sleep nicely for 'n' uS */
++ int d = n / msecs_to_jiffies(1000);
++ if (!d)
++ udelay(n);
++ else
++ msleep(jiffies_to_msecs(d));
++}
++
+ static void rt_decvol(struct rtrack *rt)
+ {
+ outb(0x58, rt->io); /* volume down + sigstr + on */
+- msleep(100);
++ sleep_delay(100000);
+ outb(0xd8, rt->io); /* volume steady + sigstr + on */
+ }
+
+ static void rt_incvol(struct rtrack *rt)
+ {
+ outb(0x98, rt->io); /* volume up + sigstr + on */
+- msleep(100);
++ sleep_delay(100000);
+ outb(0xd8, rt->io); /* volume steady + sigstr + on */
+ }
+
+@@ -109,7 +120,7 @@ static int rt_setvol(struct rtrack *rt,
+
+ if (vol == 0) { /* volume = 0 means mute the card */
+ outb(0x48, rt->io); /* volume down but still "on" */
+- msleep(2000); /* make sure it's totally down */
++ sleep_delay(2000000); /* make sure it's totally down */
+ outb(0xd0, rt->io); /* volume steady, off */
+ rt->curvol = 0; /* track the volume state! */
+ mutex_unlock(&rt->lock);
+@@ -144,7 +155,7 @@ static void send_0_byte(struct rtrack *r
+ outb_p(128+64+16+8+ 1, rt->io); /* on + wr-enable + data low */
+ outb_p(128+64+16+8+2+1, rt->io); /* clock */
+ }
+- msleep(1);
++ sleep_delay(1000);
+ }
+
+ static void send_1_byte(struct rtrack *rt)
+@@ -158,7 +169,7 @@ static void send_1_byte(struct rtrack *r
+ outb_p(128+64+16+8+4+2+1, rt->io); /* clock */
+ }
+
+- msleep(1);
++ sleep_delay(1000);
+ }
+
+ static int rt_setfreq(struct rtrack *rt, unsigned long freq)
+@@ -412,7 +423,7 @@ static int __init rtrack_init(void)
+
+ /* this ensures that the volume is all the way down */
+ outb(0x48, rt->io); /* volume down but still "on" */
+- msleep(2000); /* make sure it's totally down */
++ sleep_delay(2000000); /* make sure it's totally down */
+ outb(0xc0, rt->io); /* steady volume, mute card */
+
+ return 0;
Modified: dists/squeeze/linux-2.6/debian/patches/series/31
==============================================================================
--- dists/squeeze/linux-2.6/debian/patches/series/31 Mon Feb 21 16:38:33 2011 (r16927)
+++ dists/squeeze/linux-2.6/debian/patches/series/31 Mon Feb 21 17:03:22 2011 (r16928)
@@ -32,3 +32,4 @@
+ debian/sched-Avoid-ABI-change-in-2.6.32.29.patch
+ bugfix/all/virtio_net-fix-oom-handling-on-tx.patch
+ bugfix/all/virtio_net-Add-schedule-check-to-napi_enable-call.patch
++ debian/revert-radio-aimslab-gcc4.5-fix-in-2.6.32.29.patch
More information about the Kernel-svn-changes
mailing list