Advanced Linux Sound Architecture

changeset:   4554:8e5dd52f972e08195f58719d6496d3733a876d83
tag:         tip
user:        perex
date:        Fri Sep 29 13:37:20 2006 +0200
files:       .hgtags
description:
Added tag v1.0.13 for changeset f74df30f7f11bb7192daea6ffcb7697a500d6c6a


diff -r f74df30f7f11bb7192daea6ffcb7697a500d6c6a -r 8e5dd52f972e08195f58719d6496d3733a876d83 .hgtags
--- a/.hgtags	Fri Sep 29 12:55:25 2006 +0200
+++ b/.hgtags	Fri Sep 29 13:37:20 2006 +0200
@@ -33,3 +33,4 @@ 5b67ed573cd9c5198bbbe77a31303e1440fc7f4e
 5b67ed573cd9c5198bbbe77a31303e1440fc7f4e v1.0.13rc1
 fac764f0371c0525559b71b98e55838d3dd15570 v1.0.13rc2
 3fac526a48b9c39b4f604180082441ab29dfeaa2 v1.0.13rc3
+f74df30f7f11bb7192daea6ffcb7697a500d6c6a v1.0.13

changeset:   3143:75ee69091322250ebce6fb360c33c25f6a5ca74e
tag:         tip
user:        perex
date:        Fri Sep 29 13:37:20 2006 +0200
files:       .hgtags
description:
Added tag v1.0.13 for changeset a518e523967d83f97ae9e783d4de1b6adb35652e


diff -r a518e523967d83f97ae9e783d4de1b6adb35652e -r 75ee69091322250ebce6fb360c33c25f6a5ca74e .hgtags
--- a/.hgtags	Fri Sep 29 13:30:51 2006 +0200
+++ b/.hgtags	Fri Sep 29 13:37:20 2006 +0200
@@ -36,3 +36,4 @@ 0e1f4f7c72a14046eafd237782e46d0e728ea9b6
 0e1f4f7c72a14046eafd237782e46d0e728ea9b6 v1.0.13rc2
 234b7353d1422f72bfbc431a6cb13b8d5ed8c8a8 v1.0.13rc3
 17891d72bc89e74e67350f2f8689679d189b6948 v1.0.13
+a518e523967d83f97ae9e783d4de1b6adb35652e v1.0.13

changeset:   66:0673ba857f6a3fa2a0b97a1e2036b6a54423de06
tag:         tip
user:        perex
date:        Fri Sep 29 13:30:57 2006 +0200
files:       .hgtags
description:
Added tag v1.0.13 for changeset 213585f2697b17be9ef139ff2aff3f75139bb5be


diff -r 213585f2697b17be9ef139ff2aff3f75139bb5be -r 0673ba857f6a3fa2a0b97a1e2036b6a54423de06 .hgtags
--- a/.hgtags	Fri Sep 29 13:30:57 2006 +0200
+++ b/.hgtags	Fri Sep 29 13:30:57 2006 +0200
@@ -12,3 +12,4 @@ 2316cce004b93148525c69aefb7927223bf09ddc
 2316cce004b93148525c69aefb7927223bf09ddc v1.0.12rc2
 f20ae39b72a32a1b9ede656d49014e7e1882928d v1.0.12
 cc718cf3b67386ffe411971394d5fe96bdd2245a v1.0.13rc2
+213585f2697b17be9ef139ff2aff3f75139bb5be v1.0.13

changeset:   65:213585f2697b17be9ef139ff2aff3f75139bb5be
tag:         v1.0.13
user:        perex
date:        Fri Sep 29 13:30:57 2006 +0200
files:       configure.in
description:
release 1.0.13
Patch-level: Merged


diff -r a7bdac20ac632823dca140f1509562376a2bf75f -r 213585f2697b17be9ef139ff2aff3f75139bb5be configure.in
--- a/configure.in	Tue Sep 12 15:35:42 2006 +0200
+++ b/configure.in	Fri Sep 29 13:30:57 2006 +0200
@@ -1,6 +1,6 @@ AC_PREREQ(2.59)
 AC_PREREQ(2.59)
 AC_INIT(oss/pcm_oss.c)
-AM_INIT_AUTOMAKE(alsa-plugins, 1.0.13rc2)
+AM_INIT_AUTOMAKE(alsa-plugins, 1.0.13)
 AC_PREFIX_DEFAULT(/usr)
 
 AC_PROG_CC

changeset:   71:abedc3b42840fac036f3964e20ed848515a06864
tag:         tip
user:        perex
date:        Fri Sep 29 13:31:04 2006 +0200
files:       .hgtags
description:
Added tag v1.0.13 for changeset da274ceffe69eff803b0284f18c734e666131bd6


diff -r da274ceffe69eff803b0284f18c734e666131bd6 -r abedc3b42840fac036f3964e20ed848515a06864 .hgtags
--- a/.hgtags	Fri Sep 29 13:31:04 2006 +0200
+++ b/.hgtags	Fri Sep 29 13:31:04 2006 +0200
@@ -16,3 +16,4 @@ 928f47efe67b3d07cd20b763765c2220a2bad160
 928f47efe67b3d07cd20b763765c2220a2bad160 v1.0.12rc2a
 acaf9da0f03943e69f01b2f2482f2ab0f31fab74 v1.0.12
 85ae05e9f4c13acfa00a9007f0af0bf31bc8b87c v1.0.13rc2
+da274ceffe69eff803b0284f18c734e666131bd6 v1.0.13

changeset:   70:da274ceffe69eff803b0284f18c734e666131bd6
tag:         v1.0.13
user:        perex
date:        Fri Sep 29 13:31:04 2006 +0200
files:       configure.in
description:
release 1.0.13
Patch-level: Merged


diff -r 3b390005437d386c44938daea9642ab1c6ae7756 -r da274ceffe69eff803b0284f18c734e666131bd6 configure.in
--- a/configure.in	Tue Sep 12 15:35:56 2006 +0200
+++ b/configure.in	Fri Sep 29 13:31:04 2006 +0200
@@ -1,6 +1,6 @@ AC_PREREQ(2.53)
 AC_PREREQ(2.53)
 AC_INIT(hdsploader/tobin.c)
-AM_INIT_AUTOMAKE(alsa-firmware, 1.0.13rc2)
+AM_INIT_AUTOMAKE(alsa-firmware, 1.0.13)
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_HEADER_STDC

changeset:   329:6ed874bc7c5d0880515feef3cea9699444387014
tag:         tip
user:        perex
date:        Fri Sep 29 13:31:02 2006 +0200
files:       .hgtags
description:
Added tag v1.0.13 for changeset 28488057ee5fd4d6f1891a8b05e7e473bf68833e


diff -r 28488057ee5fd4d6f1891a8b05e7e473bf68833e -r 6ed874bc7c5d0880515feef3cea9699444387014 .hgtags
--- a/.hgtags	Fri Sep 29 13:31:01 2006 +0200
+++ b/.hgtags	Fri Sep 29 13:31:02 2006 +0200
@@ -22,3 +22,4 @@ c27fc3ff10787ad9e10b69764d5907bfbd401c8f
 c27fc3ff10787ad9e10b69764d5907bfbd401c8f v1.0.12rc2
 38b9278a205c799b92d986c673026ff2fb23ce3e v1.0.12
 8c44e489a1ae9886308e942ad17fb79f1c9cfbe0 v1.0.13rc2
+28488057ee5fd4d6f1891a8b05e7e473bf68833e v1.0.13

changeset:   328:28488057ee5fd4d6f1891a8b05e7e473bf68833e
tag:         v1.0.13
user:        perex
date:        Fri Sep 29 13:31:01 2006 +0200
files:       Makefile
description:
release 1.0.13
Patch-level: Merged


diff -r 7f7a0bf510a494e62280e06fa2cce8fe3e539207 -r 28488057ee5fd4d6f1891a8b05e7e473bf68833e Makefile
--- a/Makefile	Tue Sep 12 15:35:53 2006 +0200
+++ b/Makefile	Fri Sep 29 13:31:01 2006 +0200
@@ -1,4 +1,4 @@ VERSION = 1.0.13rc2
-VERSION = 1.0.13rc2
+VERSION = 1.0.13
 TOP = .
 SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \
 	mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl us428control \

changeset:   826:1e3df592d773d9215294c6606c7c0a6a65c87aa8
tag:         tip
user:        perex
date:        Fri Sep 29 13:30:59 2006 +0200
files:       .hgtags
description:
Added tag v1.0.13 for changeset 6504a92784b8d34861d2304c1afb3b689ad4e5d6


diff -r 6504a92784b8d34861d2304c1afb3b689ad4e5d6 -r 1e3df592d773d9215294c6606c7c0a6a65c87aa8 .hgtags
--- a/.hgtags	Fri Sep 29 13:30:59 2006 +0200
+++ b/.hgtags	Fri Sep 29 13:30:59 2006 +0200
@@ -26,3 +26,4 @@ 071f769c3a9a62d76c52b8167655ae6e1c76dd8a
 071f769c3a9a62d76c52b8167655ae6e1c76dd8a v1.0.13rc1
 a505bb1568f9a523e1c66b7acdb006acd47a5a0a v1.0.13rc2
 a956137bb3443bcf1e6b14fb8a2f167965206268 v1.0.13rc3
+6504a92784b8d34861d2304c1afb3b689ad4e5d6 v1.0.13

changeset:   825:6504a92784b8d34861d2304c1afb3b689ad4e5d6
tag:         v1.0.13
user:        perex
date:        Fri Sep 29 13:30:59 2006 +0200
files:       configure.in
description:
release 1.0.13
Patch-level: Merged


diff -r 0ab3736fdd58bdf0cb1095c4857afaba7e1088ed -r 6504a92784b8d34861d2304c1afb3b689ad4e5d6 configure.in
--- a/configure.in	Mon Sep 25 15:22:01 2006 +0200
+++ b/configure.in	Fri Sep 29 13:30:59 2006 +0200
@@ -2,7 +2,7 @@ AC_PREREQ(2.59)
 AC_PREREQ(2.59)
 AC_INIT(alsamixer/alsamixer.c)
 AC_PREFIX_DEFAULT(/usr)
-AM_INIT_AUTOMAKE(alsa-utils, 1.0.13rc3)
+AM_INIT_AUTOMAKE(alsa-utils, 1.0.13)
 
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.14])

changeset:   2211:36cb1121ce3b1ff7a8ab39c704ad5f6ec06a1993
tag:         tip
user:        perex
date:        Fri Sep 29 13:30:53 2006 +0200
files:       .hgtags
description:
Added tag v1.0.13 for changeset cf4a3d6a053ade90e197d774bb4860b564058942


diff -r cf4a3d6a053ade90e197d774bb4860b564058942 -r 36cb1121ce3b1ff7a8ab39c704ad5f6ec06a1993 .hgtags
--- a/.hgtags	Fri Sep 29 13:30:53 2006 +0200
+++ b/.hgtags	Fri Sep 29 13:30:53 2006 +0200
@@ -26,3 +26,4 @@ d3bd2ac29044cd4cafce1b714c249866ed051e2a
 d3bd2ac29044cd4cafce1b714c249866ed051e2a v1.0.13rc1
 258849dfcb4c27a019f74820ebe7829bcdf82724 v1.0.13rc2
 3de06f3eea80471e365ea706052a747e50edb587 v1.0.13rc3
+cf4a3d6a053ade90e197d774bb4860b564058942 v1.0.13

changeset:   2210:cf4a3d6a053ade90e197d774bb4860b564058942
tag:         v1.0.13
user:        perex
date:        Fri Sep 29 13:30:53 2006 +0200
files:       configure.in
description:
release 1.0.13
Patch-level: Merged


diff -r ee03fb4471b3ca9622df57c5b3d4d00ff42cf539 -r cf4a3d6a053ade90e197d774bb4860b564058942 configure.in
--- a/configure.in	Fri Sep 29 10:44:58 2006 +0200
+++ b/configure.in	Fri Sep 29 13:30:53 2006 +0200
@@ -9,7 +9,7 @@ dnl remove API = c+1:0:0
 dnl remove API = c+1:0:0
 dnl *************************************************
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(alsa-lib, 1.0.13rc3)
+AM_INIT_AUTOMAKE(alsa-lib, 1.0.13)
 eval LIBTOOL_VERSION_INFO="2:0:0"
 dnl *************************************************
 AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}")

changeset:   4557:73f191b038adca21549b282c764769e404e19e14
tag:         tip
user:        perex
date:        Fri Sep 29 13:30:51 2006 +0200
files:       .hgtags
description:
Added tag v1.0.13 for changeset 80796d6903db253fd330e662f113acdcf54838ce


diff -r 80796d6903db253fd330e662f113acdcf54838ce -r 73f191b038adca21549b282c764769e404e19e14 .hgtags
--- a/.hgtags	Fri Sep 29 13:30:51 2006 +0200
+++ b/.hgtags	Fri Sep 29 13:30:51 2006 +0200
@@ -33,3 +33,4 @@ 5b67ed573cd9c5198bbbe77a31303e1440fc7f4e
 5b67ed573cd9c5198bbbe77a31303e1440fc7f4e v1.0.13rc1
 fac764f0371c0525559b71b98e55838d3dd15570 v1.0.13rc2
 3fac526a48b9c39b4f604180082441ab29dfeaa2 v1.0.13rc3
+80796d6903db253fd330e662f113acdcf54838ce v1.0.13

changeset:   4556:80796d6903db253fd330e662f113acdcf54838ce
tag:         v1.0.13
parent:      4555:4bb824adc11a915bca0d1cf8fb9d557026466760
parent:      4553:f74df30f7f11bb7192daea6ffcb7697a500d6c6a
user:        perex
date:        Fri Sep 29 13:30:51 2006 +0200
files:       
description:
release 1.0.13
Patch-level: Merged


diff -r 4bb824adc11a915bca0d1cf8fb9d557026466760 -r 80796d6903db253fd330e662f113acdcf54838ce core/hwdep.c
--- a/core/hwdep.c	Thu Sep 28 12:02:57 2006 +0200
+++ b/core/hwdep.c	Fri Sep 29 13:30:51 2006 +0200
@@ -158,6 +158,7 @@ static int snd_hwdep_release(struct inod
 {
 	int err = -ENXIO;
 	struct snd_hwdep *hw = file->private_data;
+	struct module *mod = hw->card->module;
 	mutex_lock(&hw->open_mutex);
 	if (hw->ops.release) {
 		err = hw->ops.release(hw, file);
@@ -167,7 +168,7 @@ static int snd_hwdep_release(struct inod
 		hw->used--;
 	snd_card_file_remove(hw->card, file);
 	mutex_unlock(&hw->open_mutex);
-	module_put(hw->card->module);
+	module_put(mod);
 	return err;
 }
 
diff -r 4bb824adc11a915bca0d1cf8fb9d557026466760 -r 80796d6903db253fd330e662f113acdcf54838ce isa/es18xx.c
--- a/isa/es18xx.c	Thu Sep 28 12:02:57 2006 +0200
+++ b/isa/es18xx.c	Fri Sep 29 13:30:51 2006 +0200
@@ -2154,6 +2154,7 @@ static int __devinit snd_audiodrive_pnpc
 	}
 	/* Control port initialization */
 	if (pnp_activate_dev(acard->devc) < 0) {
+		kfree(cfg);
 		snd_printk(KERN_ERR PFX "PnP control configure failure (out of resources?)\n");
 		return -EAGAIN;
 	}

changeset:   4554:33e8dadf9d0ae49f5c6933a4733b2463d5c2d7a2
parent:      4551:7cc57ec28195798dcf45c0125ea8991e00ec845d
user:        perex
date:        Thu Sep 28 12:02:49 2006 +0200
files:       Makefile
description:
just test, please remove


diff -r 7cc57ec28195798dcf45c0125ea8991e00ec845d -r 33e8dadf9d0ae49f5c6933a4733b2463d5c2d7a2 Makefile
--- a/Makefile	Tue Sep 26 15:32:35 2006 +0200
+++ b/Makefile	Thu Sep 28 12:02:49 2006 +0200
@@ -12,3 +12,4 @@ endif
 endif
 
 soundcore-objs  := sound_core.o sound_firmware.o
+

changeset:   3141:17891d72bc89e74e67350f2f8689679d189b6948
tag:         v1.0.13
user:        perex
date:        Fri Sep 29 13:30:51 2006 +0200
files:       configure.in
description:
release 1.0.13
Patch-level: Merged


diff -r c31f356d6be7b4ba7ff8d1ae920eec2274b2eac7 -r 17891d72bc89e74e67350f2f8689679d189b6948 configure.in
--- a/configure.in	Mon Sep 25 15:26:53 2006 +0200
+++ b/configure.in	Fri Sep 29 13:30:51 2006 +0200
@@ -5,7 +5,7 @@ AC_PREREQ(2.59)
 AC_PREREQ(2.59)
 AC_INIT(acore/sound.patch)
 AC_PREFIX_DEFAULT(/usr)
-CONFIG_SND_VERSION="1.0.13rc3"
+CONFIG_SND_VERSION="1.0.13"
 
 dnl Checks for programs.
 AC_PROG_CC

changeset:   3142:a518e523967d83f97ae9e783d4de1b6adb35652e
tag:         tip
user:        perex
date:        Fri Sep 29 13:30:51 2006 +0200
files:       .hgtags
description:
Added tag v1.0.13 for changeset 17891d72bc89e74e67350f2f8689679d189b6948


diff -r 17891d72bc89e74e67350f2f8689679d189b6948 -r a518e523967d83f97ae9e783d4de1b6adb35652e .hgtags
--- a/.hgtags	Fri Sep 29 13:30:51 2006 +0200
+++ b/.hgtags	Fri Sep 29 13:30:51 2006 +0200
@@ -35,3 +35,4 @@ 36a39e2d750d02da49c08087094ab5a34a029062
 36a39e2d750d02da49c08087094ab5a34a029062 v1.0.13rc1
 0e1f4f7c72a14046eafd237782e46d0e728ea9b6 v1.0.13rc2
 234b7353d1422f72bfbc431a6cb13b8d5ed8c8a8 v1.0.13rc3
+17891d72bc89e74e67350f2f8689679d189b6948 v1.0.13

changeset:   4553:f74df30f7f11bb7192daea6ffcb7697a500d6c6a
tag:         tip
user:        tiwai
date:        Fri Sep 29 12:55:25 2006 +0200
files:       core/hwdep.c
description:
Dereference after free in snd_hwdep_release()

snd_card_file_remove() may free hw->card so we can't dereference
hw->card->module after that.

Coverity ID 1420.

Patch-level: ASAP
Signed-off-by: Florin Malita <fmalita@...>


diff -r 2420b2535c08d5861931c978cdc63824340fa557 -r f74df30f7f11bb7192daea6ffcb7697a500d6c6a core/hwdep.c
--- a/core/hwdep.c	Thu Sep 28 12:35:48 2006 +0200
+++ b/core/hwdep.c	Fri Sep 29 12:55:25 2006 +0200
@@ -158,6 +158,7 @@ static int snd_hwdep_release(struct inod
 {
 	int err = -ENXIO;
 	struct snd_hwdep *hw = file->private_data;
+	struct module *mod = hw->card->module;
 	mutex_lock(&hw->open_mutex);
 	if (hw->ops.release) {
 		err = hw->ops.release(hw, file);
@@ -167,7 +168,7 @@ static int snd_hwdep_release(struct inod
 		hw->used--;
 	snd_card_file_remove(hw->card, file);
 	mutex_unlock(&hw->open_mutex);
-	module_put(hw->card->module);
+	module_put(mod);
 	return err;
 }

changeset:   2209:ee03fb4471b3ca9622df57c5b3d4d00ff42cf539
tag:         tip
user:        perex
date:        Fri Sep 29 10:44:58 2006 +0200
files:       configure.in
description:
configure.in - fix "checking for versioned symbols" error in ./configure 
See: bug#2274

checking for versioned symbols... ./configure: line 19347: test: "1: integer
expression expected
./configure: line 19350: test: "1: integer expression expected

This is caused by my libtool VERSION string:
VERSION="1.5.22 Debian 1.5.22-2"

The test in configure.in can't currently deal with the quotes.


diff -r 88fd3c6687c565cc1e42df1ebbbbb0aeffe8eda0 -r ee03fb4471b3ca9622df57c5b3d4d00ff42cf539 configure.in
--- a/configure.in	Fri Sep 29 10:34:22 2006 +0200
+++ b/configure.in	Fri Sep 29 10:44:58 2006 +0200
@@ -84,7 +84,7 @@ AC_ARG_WITH(versioned,
   versioned="$withval", versioned="yes")
 if test "$versioned" = "yes"; then
   # it seems that GNU ld versions since 2.10 are not broken
-  xres=`grep '^VERSION=' $ac_aux_dir/libtool | cut -d = -f 2`
+  xres=`grep '^VERSION=' $ac_aux_dir/libtool | cut -d = -f 2 | cut -d \" -f 2`
   major=`echo $xres | cut -d . -f 1`
   minor=`echo $xres | cut -d . -f 2`
   pass=0

changeset:   2208:88fd3c6687c565cc1e42df1ebbbbb0aeffe8eda0
tag:         tip
user:        perex
date:        Fri Sep 29 10:34:22 2006 +0200
files:       src/timer/timer_hw.c
description:
timer_hw: fix file descriptor leak
See: bug#2465


diff -r 636a0fb30d1e667e29b595fbd5d38b93f8a430e2 -r 88fd3c6687c565cc1e42df1ebbbbb0aeffe8eda0 src/timer/timer_hw.c
--- a/src/timer/timer_hw.c	Thu Sep 28 16:42:19 2006 +0200
+++ b/src/timer/timer_hw.c	Fri Sep 29 10:34:22 2006 +0200
@@ -264,8 +264,8 @@ int snd_timer_hw_open(snd_timer_t **hand
 		}
 		if (ioctl(fd, SNDRV_TIMER_IOCTL_TREAD, &arg) < 0) {
 			ret = -errno;
+		      __no_tread:
 			close(fd);
-		      __no_tread:
 			SNDMSG("extended read is not supported (SNDRV_TIMER_IOCTL_TREAD)");
 			return ret;
 		}

changeset:   59:ae3d6e55776b01e01c7c2b6589a877598f0f0c1f
tag:         tip
user:        root@...
date:        Fri Sep 29 08:14:50 2006 +0200
files:       ksync
description:
ksync: replace GITROOT_KERNEL with get_git_root(), add chdir() to rebase cmd


diff -r c708f685322f3507c6b6dad1200a39911b7b196a -r ae3d6e55776b01e01c7c2b6589a877598f0f0c1f ksync
--- a/ksync	Thu Sep 28 15:43:22 2006 +0200
+++ b/ksync	Fri Sep 29 08:14:50 2006 +0200
@@ -1399,7 +1399,7 @@ def git_update():
 		return
 	ok = False
 	try:
-		os.chdir(GITROOT_KERNEL)
+		os.chdir(get_git_root())
 		my_popen3s("stg branch master", filter="Branch \"master\" is already the current branch")
 		sys.stdout.flush()
 		os.system("git-pull origin")
@@ -1416,9 +1416,9 @@ def git_rsync():
 		return
 	ok = False
 	try:
-		os.chdir(GITROOT_KERNEL)
+		os.chdir(get_git_root())
 		my_popen3s("stg branch linus", filter="Branch \"linus\" is already the current branch", ignore_stdout=True)
-		os.chdir(GITROOT_KERNEL + '/.git')
+		os.chdir(get_git_root() + '/.git')
 		os.system("git-update-server-info")
 		sys.stdout.flush()
 		os.system("rsync -za -essh --delete * perex@...")
@@ -1438,7 +1438,7 @@ def git_merge(rev):
 	ok = False
 	reason = 'Failed to merge patch "%s"' % rev
 	try:
-		os.chdir(GITROOT_KERNEL)
+		os.chdir(get_git_root())
 		entry = {}
 		entry['url'] = int(rev)
  		merge1(entry, do_patch_level=True, quiet=True)
@@ -1454,7 +1454,7 @@ def git_merge(rev):
  		git_unlock(quiet=True)
 
 def git_read_patches(branch, file):
-	fp = open(GITROOT_KERNEL + '/.git/patches/%s/%s' % (branch, file))
+	fp = open(get_git_root() + '/.git/patches/%s/%s' % (branch, file))
 	patches = fp.readlines()
 	fp.close()
 	res = []
@@ -1463,7 +1463,7 @@ def git_read_patches(branch, file):
 	return res
 
 def git_read_description(branch, rev):
-	fp = open(GITROOT_KERNEL + '/.git/patches/%s/patches/%s/description' % (branch, rev))
+	fp = open(get_git_root() + '/.git/patches/%s/patches/%s/description' % (branch, rev))
 	res = fp.readlines()
 	fp.close()
 	return res
@@ -1475,7 +1475,7 @@ def git_move(lo, hi):
 		return
 	ok = False
 	try:
-		os.chdir(GITROOT_KERNEL)
+		os.chdir(get_git_root())
 		git_environ()
 		patches = git_read_patches('mm', 'applied') + git_read_patches('mm', 'unapplied')
 		patches.sort()
@@ -1490,7 +1490,7 @@ def git_move(lo, hi):
  		git_unlock()
 
 def git_remove1(lo, hi, branch):
-	os.chdir(GITROOT_KERNEL)
+	os.chdir(get_git_root())
 	git_environ()
 	patches = git_read_patches(branch, 'applied') + git_read_patches(branch, 'unapplied')
 	patches.reverse()
@@ -1569,6 +1569,7 @@ def git_rebase():
 		return
 	ok = False
 	try:
+		os.chdir(get_git_root())
 		for branch in STG_BRANCHES:
 			print 'Rebasing branch %s.' % branch
 			my_popen3s("stg branch %s" % branch, filter="Branch \"%s\" is already the current branch" % branch, ignore_stdout=True)

changeset:   2207:636a0fb30d1e667e29b595fbd5d38b93f8a430e2
tag:         tip
user:        perex
date:        Thu Sep 28 16:42:19 2006 +0200
files:       src/conf.c
description:
configuration: added one more alias check to detect a circular configuration


diff -r 4f65c9223ad687c74d051bb0c83fcced20366e1c -r 636a0fb30d1e667e29b595fbd5d38b93f8a430e2 src/conf.c
--- a/src/conf.c	Thu Sep 28 15:47:25 2006 +0200
+++ b/src/conf.c	Thu Sep 28 16:42:19 2006 +0200
@@ -2405,7 +2405,7 @@ int snd_config_save(snd_config_t *config
 { \
 	snd_config_t *res = NULL; \
 	char *old_key; \
-	int err, first = 1; \
+	int err, first = 1, maxloop = 1000; \
 	assert(config && key); \
 	while (1) { \
 		old_key = strdup(key); \
@@ -2424,14 +2424,18 @@ int snd_config_save(snd_config_t *config
 		} \
 		if (snd_config_get_string(res, &key) < 0) \
 			break; \
-		if (!first && strcmp(key, old_key) == 0) { \
-			SNDERR("key %s refers to itself"); \
+		if (!first && (strcmp(key, old_key) == 0 || maxloop <= 0)) { \
+			if (maxloop == 0) \
+				SNDERR("maximum loop count reached (circular configuration?)"); \
+			else \
+				SNDERR("key %s refers to itself", key); \
 			err = -EINVAL; \
 			res = NULL; \
 			break; \
 		} \
 		free(old_key); \
 		first = 0; \
+		maxloop--; \
 	} \
 	free(old_key); \
 	if (!res) \

changeset:   2206:4f65c9223ad687c74d051bb0c83fcced20366e1c
tag:         tip
user:        perex
date:        Thu Sep 28 15:47:25 2006 +0200
files:       src/conf.c src/control/control.c
description:
configuration: avoid endless loop when a key refers to itself
remove one warning from tlv_read routine in control.c


diff -r 3d87a059c9b01ff35e54a4f043e593664e254cc5 -r 4f65c9223ad687c74d051bb0c83fcced20366e1c src/conf.c
--- a/src/conf.c	Wed Sep 27 11:11:29 2006 +0200
+++ b/src/conf.c	Thu Sep 28 15:47:25 2006 +0200
@@ -2404,9 +2404,16 @@ int snd_config_save(snd_config_t *config
 #define SND_CONFIG_SEARCH_ALIAS(config, base, key, result, fcn1, fcn2) \
 { \
 	snd_config_t *res = NULL; \
+	char *old_key; \
 	int err, first = 1; \
 	assert(config && key); \
-	do { \
+	while (1) { \
+		old_key = strdup(key); \
+		if (old_key == NULL) { \
+			err = -ENOMEM; \
+			res = NULL; \
+			break; \
+		} \
 		err = first && base ? -EIO : fcn1(config, config, key, &res); \
 		if (err < 0) { \
 			if (!base) \
@@ -2415,8 +2422,18 @@ int snd_config_save(snd_config_t *config
 			if (err < 0) \
 				break; \
 		} \
+		if (snd_config_get_string(res, &key) < 0) \
+			break; \
+		if (!first && strcmp(key, old_key) == 0) { \
+			SNDERR("key %s refers to itself"); \
+			err = -EINVAL; \
+			res = NULL; \
+			break; \
+		} \
+		free(old_key); \
 		first = 0; \
-	} while (snd_config_get_string(res, &key) >= 0); \
+	} \
+	free(old_key); \
 	if (!res) \
 		return err; \
 	if (result) \
diff -r 3d87a059c9b01ff35e54a4f043e593664e254cc5 -r 4f65c9223ad687c74d051bb0c83fcced20366e1c src/control/control.c
--- a/src/control/control.c	Wed Sep 27 11:11:29 2006 +0200
+++ b/src/control/control.c	Thu Sep 28 15:47:25 2006 +0200
@@ -469,7 +469,7 @@ int snd_ctl_elem_tlv_read(snd_ctl_t *ctl
 	tlv[0] = -1;
 	tlv[1] = 0;
 	err = snd_ctl_tlv_do(ctl, 0, id, tlv, tlv_size);
-	if (err >= 0 && tlv[0] == -1)
+	if (err >= 0 && tlv[0] == (unsigned int)-1)
 		err = -ENXIO;
 	return err;
 }

changeset:   58:c708f685322f3507c6b6dad1200a39911b7b196a
tag:         tip
user:        root@...
date:        Thu Sep 28 15:43:22 2006 +0200
files:       ksync
description:
ksync: fixed small problems with double merge (ASAP: linus + mm)


diff -r 259e7d78636894abd730c320dae3b22caf96dd83 -r c708f685322f3507c6b6dad1200a39911b7b196a ksync
--- a/ksync	Thu Sep 28 12:44:00 2006 +0200
+++ b/ksync	Thu Sep 28 15:43:22 2006 +0200
@@ -903,7 +903,7 @@ def merge1(entry, t=False, do_patch_leve
         	print 'New files: %s' % nfiles
 
 	if USE_STG and do_patch_level:
-		if log['patchlevel'] == 'ASAP':
+		if log['patchlevel'] == 'asap':
 			branch = 'linus'
 		my_popen3s('stg branch %s' % branch, filter=['is already the current branch'], ignore_stdout=quiet)
 
@@ -1444,7 +1444,7 @@ def git_merge(rev):
  		merge1(entry, do_patch_level=True, quiet=True)
  		reason += '\nFirst level merging done.'
  		if branch == 'linus':
-			my_popen3s('stg branch mm' % GITROOT_BRANCH, filter=['is already the current branch'])
+			my_popen3s('stg branch mm', filter=['is already the current branch'], ignore_stdout=True)
 			reason += '\nSwitch to branch mm ok.'
  			merge1(entry, quiet=True)
 		ok = True