diff for duplicates of <20050709000439.GF2596@us.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 3600d92..ac6ff3d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -48,7 +48,7 @@ diff -urpN 2.6.13-rc2-kj/sound/usb/usx2y/usX2Yhwdep.c 2.6.13-rc2-kj-dev/sound/us @@ -232,8 +232,7 @@ static int snd_usX2Y_hwdep_dsp_load(snd_ if (err) return err; - if (dsp->index == 1) { + if (dsp->index = 1) { - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout(HZ/4); // give the device some time + msleep(250); // give the device some time @@ -65,7 +65,7 @@ diff -urpN 2.6.13-rc2-kj/sound/usb/usx2y/usx2yhwdeppcm.c 2.6.13-rc2-kj-dev/sound +#include <linux/delay.h> #include "usbusx2yaudio.c" - #if defined(USX2Y_NRPACKS_VARIABLE) || (!defined(USX2Y_NRPACKS_VARIABLE) && USX2Y_NRPACKS == 1) + #if defined(USX2Y_NRPACKS_VARIABLE) || (!defined(USX2Y_NRPACKS_VARIABLE) && USX2Y_NRPACKS = 1) @@ -520,11 +521,8 @@ static int snd_usX2Y_usbpcm_prepare(snd_ usX2Y->hwdep_pcm_shm->playback_iso_start = -1; if (atomic_read(&subs->state) < state_PREPARED) { @@ -79,10 +79,3 @@ diff -urpN 2.6.13-rc2-kj/sound/usb/usx2y/usx2yhwdeppcm.c 2.6.13-rc2-kj-dev/sound err = -ERESTARTSYS; goto up_prepare_mutex; } - - -------------------------------------------------------- -This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening -July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual -core and dual graphics technology at this free one hour event hosted by HP, -AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar diff --git a/a/content_digest b/N1/content_digest index 97519c4..58201e8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020050709000324.GD2596@us.ibm.com\0" "From\0Nishanth Aravamudan <nacc@us.ibm.com>\0" "Subject\0[PATCH 3/14] sound/usb: fix-up sleeping paths\0" - "Date\0Fri, 8 Jul 2005 17:04:39 -0700\0" + "Date\0Sat, 09 Jul 2005 00:04:39 +0000\0" "To\0perex@suse.cz\0" "Cc\0alsa-devel@alsa-project.org" " linux-sound@vger.kernel.org\0" @@ -57,7 +57,7 @@ "@@ -232,8 +232,7 @@ static int snd_usX2Y_hwdep_dsp_load(snd_\n" " \tif (err)\n" " \t\treturn err;\n" - " \tif (dsp->index == 1) {\n" + " \tif (dsp->index = 1) {\n" "-\t\tset_current_state(TASK_UNINTERRUPTIBLE);\n" "-\t\tschedule_timeout(HZ/4);\t\t\t// give the device some time \n" "+\t\tmsleep(250);\t\t\t\t// give the device some time\n" @@ -74,7 +74,7 @@ "+#include <linux/delay.h>\n" " #include \"usbusx2yaudio.c\"\n" " \n" - " #if defined(USX2Y_NRPACKS_VARIABLE) || (!defined(USX2Y_NRPACKS_VARIABLE) && USX2Y_NRPACKS == 1)\n" + " #if defined(USX2Y_NRPACKS_VARIABLE) || (!defined(USX2Y_NRPACKS_VARIABLE) && USX2Y_NRPACKS = 1)\n" "@@ -520,11 +521,8 @@ static int snd_usX2Y_usbpcm_prepare(snd_\n" " \t\tusX2Y->hwdep_pcm_shm->playback_iso_start = -1;\n" " \t\tif (atomic_read(&subs->state) < state_PREPARED) {\n" @@ -87,13 +87,6 @@ "+\t\t\t\tif (msleep_interruptible(10)) {\n" " \t\t\t\t\terr = -ERESTARTSYS;\n" " \t\t\t\t\tgoto up_prepare_mutex;\n" - " \t\t\t\t}\n" - "\n" - "\n" - "-------------------------------------------------------\n" - "This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening\n" - "July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual\n" - "core and dual graphics technology at this free one hour event hosted by HP, \n" - AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar + " \t\t\t\t}" -0a3b0829b44a1ea64905f5169123f6ed3f6226462f4229ea0a24817fa0217037 +53b52b8bf48ba0def5da68f438c5fd98c4a25a8c3f17c4adf1a8dbca80d2ff01
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.