From: Russell Bryant <russell@russellbryant.com>
Date: Sat, 5 Jan 2008 02:12:10 +0000 (+0000)
Subject: Merged revisions 96644 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=585a31beb3fe140552c99cc5416268dc12f1c6f3;p=thirdparty%2Fasterisk.git

Merged revisions 96644 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r96644 | russell | 2008-01-04 20:09:19 -0600 (Fri, 04 Jan 2008) | 2 lines

Don't pass an empty string as the device name.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@96645 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/devicestate.c b/main/devicestate.c
index d7790ba926..bd9261306d 100644
--- a/main/devicestate.c
+++ b/main/devicestate.c
@@ -466,7 +466,7 @@ static int __ast_devstate_changed_literal(enum ast_device_state state, char *buf
 	 */
 	if (!norecurse && (tmp = strrchr(device, '-'))) {
 		*tmp = '\0';
-		__ast_devstate_changed_literal(state, tmp, 1);
+		__ast_devstate_changed_literal(state, device, 1);
 	}
 	
 	return 1;