diff for duplicates of <20050709000324.GD2596@us.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 10638c6..f807bbc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -56,7 +56,7 @@ diff -urpN 2.6.13-rc2-kj/sound/pci/ac97/ac97_codec.c 2.6.13-rc2-kj-dev/sound/pci - for (i = HZ/10; i >= 0; i--) { + end_time = jiffies + msecs_to_jiffies(100); + do { - if (snd_ac97_read(ac97, AC97_MASTER) == 0x8101) + if (snd_ac97_read(ac97, AC97_MASTER) = 0x8101) break; set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(1); @@ -109,7 +109,7 @@ diff -urpN 2.6.13-rc2-kj/sound/pci/cs46xx/cs46xx_lib.c 2.6.13-rc2-kj-dev/sound/p --- 2.6.13-rc2-kj/sound/pci/cs46xx/cs46xx_lib.c 2005-07-06 07:57:20.000000000 -0700 +++ 2.6.13-rc2-kj-dev/sound/pci/cs46xx/cs46xx_lib.c 2005-07-06 22:04:35.000000000 -0700 @@ -2400,8 +2400,7 @@ static void snd_cs46xx_codec_reset (ac97 - if ((err = snd_ac97_read(ac97, AC97_REC_GAIN)) == 0x8a05) + if ((err = snd_ac97_read(ac97, AC97_REC_GAIN)) = 0x8a05) return; - set_current_state(TASK_UNINTERRUPTIBLE); @@ -150,7 +150,7 @@ diff -urpN 2.6.13-rc2-kj/sound/pci/cs46xx/cs46xx_lib.c 2.6.13-rc2-kj-dev/sound/p @@ -3122,8 +3118,7 @@ static int snd_cs46xx_chip_init(cs46xx_t */ - if ((snd_cs46xx_peekBA0(chip, BA0_ACISV) & (ACISV_ISV3 | ACISV_ISV4)) == (ACISV_ISV3 | ACISV_ISV4)) + if ((snd_cs46xx_peekBA0(chip, BA0_ACISV) & (ACISV_ISV3 | ACISV_ISV4)) = (ACISV_ISV3 | ACISV_ISV4)) goto ok2; - set_current_state(TASK_UNINTERRUPTIBLE); - schedule_timeout((HZ+99)/100); @@ -162,9 +162,9 @@ diff -urpN 2.6.13-rc2-kj/sound/pci/ens1370.c 2.6.13-rc2-kj-dev/sound/pci/ens1370 --- 2.6.13-rc2-kj/sound/pci/ens1370.c 2005-07-06 07:57:20.000000000 -0700 +++ 2.6.13-rc2-kj-dev/sound/pci/ens1370.c 2005-07-06 22:05:18.000000000 -0700 @@ -2008,21 +2008,11 @@ static int __devinit snd_ensoniq_create( - if (pci->vendor == es1371_ac97_reset_hack[idx].vid && - pci->device == es1371_ac97_reset_hack[idx].did && - ensoniq->rev == es1371_ac97_reset_hack[idx].rev) { + if (pci->vendor = es1371_ac97_reset_hack[idx].vid && + pci->device = es1371_ac97_reset_hack[idx].did && + ensoniq->rev = es1371_ac97_reset_hack[idx].rev) { - unsigned long tmo; - signed long tmo2; - @@ -503,7 +503,7 @@ diff -urpN 2.6.13-rc2-kj/sound/pci/ymfpci/ymfpci_main.c 2.6.13-rc2-kj-dev/sound/ - end_time = (jiffies + ((3 * HZ) / 4)) + 1; + end_time = jiffies + msecs_to_jiffies(750); do { - if ((snd_ymfpci_readw(chip, reg) & 0x8000) == 0) + if ((snd_ymfpci_readw(chip, reg) & 0x8000) = 0) return 0; set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(1); @@ -512,10 +512,3 @@ diff -urpN 2.6.13-rc2-kj/sound/pci/ymfpci/ymfpci_main.c 2.6.13-rc2-kj-dev/sound/ snd_printk("codec_ready: codec %i is not ready [0x%x]\n", secondary, snd_ymfpci_readw(chip, reg)); return -EBUSY; } - - -------------------------------------------------------- -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 3c8687d..25bcfb9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Nishanth Aravamudan <nacc@us.ibm.com>\0" "Subject\0[PATCH 1/14] sound/pci: fix-up sleeping paths\0" - "Date\0Fri, 8 Jul 2005 17:03:24 -0700\0" + "Date\0Sat, 09 Jul 2005 00:03:24 +0000\0" "To\0perex@suse.cz" sailer@ife.ee.ethz.ch mulix@mulix.org @@ -67,7 +67,7 @@ "-\t\tfor (i = HZ/10; i >= 0; i--) {\n" "+\t\tend_time = jiffies + msecs_to_jiffies(100);\n" "+\t\tdo {\n" - " \t\t\tif (snd_ac97_read(ac97, AC97_MASTER) == 0x8101)\n" + " \t\t\tif (snd_ac97_read(ac97, AC97_MASTER) = 0x8101)\n" " \t\t\t\tbreak;\n" " \t\t\tset_current_state(TASK_UNINTERRUPTIBLE);\n" " \t\t\tschedule_timeout(1);\n" @@ -120,7 +120,7 @@ "--- 2.6.13-rc2-kj/sound/pci/cs46xx/cs46xx_lib.c\t2005-07-06 07:57:20.000000000 -0700\n" "+++ 2.6.13-rc2-kj-dev/sound/pci/cs46xx/cs46xx_lib.c\t2005-07-06 22:04:35.000000000 -0700\n" "@@ -2400,8 +2400,7 @@ static void snd_cs46xx_codec_reset (ac97\n" - " \t\tif ((err = snd_ac97_read(ac97, AC97_REC_GAIN)) == 0x8a05)\n" + " \t\tif ((err = snd_ac97_read(ac97, AC97_REC_GAIN)) = 0x8a05)\n" " \t\t\treturn;\n" " \n" "-\t\tset_current_state(TASK_UNINTERRUPTIBLE);\n" @@ -161,7 +161,7 @@ " \n" "@@ -3122,8 +3118,7 @@ static int snd_cs46xx_chip_init(cs46xx_t\n" " \t\t */\n" - " \t\tif ((snd_cs46xx_peekBA0(chip, BA0_ACISV) & (ACISV_ISV3 | ACISV_ISV4)) == (ACISV_ISV3 | ACISV_ISV4))\n" + " \t\tif ((snd_cs46xx_peekBA0(chip, BA0_ACISV) & (ACISV_ISV3 | ACISV_ISV4)) = (ACISV_ISV3 | ACISV_ISV4))\n" " \t\t\tgoto ok2;\n" "-\t\tset_current_state(TASK_UNINTERRUPTIBLE);\n" "-\t\tschedule_timeout((HZ+99)/100);\n" @@ -173,9 +173,9 @@ "--- 2.6.13-rc2-kj/sound/pci/ens1370.c\t2005-07-06 07:57:20.000000000 -0700\n" "+++ 2.6.13-rc2-kj-dev/sound/pci/ens1370.c\t2005-07-06 22:05:18.000000000 -0700\n" "@@ -2008,21 +2008,11 @@ static int __devinit snd_ensoniq_create(\n" - " \t\tif (pci->vendor == es1371_ac97_reset_hack[idx].vid &&\n" - " \t\t pci->device == es1371_ac97_reset_hack[idx].did &&\n" - " \t\t ensoniq->rev == es1371_ac97_reset_hack[idx].rev) {\n" + " \t\tif (pci->vendor = es1371_ac97_reset_hack[idx].vid &&\n" + " \t\t pci->device = es1371_ac97_reset_hack[idx].did &&\n" + " \t\t ensoniq->rev = es1371_ac97_reset_hack[idx].rev) {\n" "-\t\t unsigned long tmo;\n" "-\t\t\tsigned long tmo2;\n" "-\n" @@ -514,7 +514,7 @@ "-\tend_time = (jiffies + ((3 * HZ) / 4)) + 1;\n" "+\tend_time = jiffies + msecs_to_jiffies(750);\n" " \tdo {\n" - " \t\tif ((snd_ymfpci_readw(chip, reg) & 0x8000) == 0)\n" + " \t\tif ((snd_ymfpci_readw(chip, reg) & 0x8000) = 0)\n" " \t\t\treturn 0;\n" " \t\tset_current_state(TASK_UNINTERRUPTIBLE);\n" " \t\tschedule_timeout(1);\n" @@ -522,13 +522,6 @@ "+\t} while (time_before(jiffies, end_time));\n" " \tsnd_printk(\"codec_ready: codec %i is not ready [0x%x]\\n\", secondary, snd_ymfpci_readw(chip, reg));\n" " \treturn -EBUSY;\n" - " }\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 + } -4a8ed1886e8d3614bfed6cabb4e8be75235fcd4ce256561e1aecef7d405facca +a3d01366d5fc9da15c9a6df2f28ef302d2926c2d7981d89babe68d0bdab02cf3
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.