--- release-0-21-fixes/mythtv/libs/libmythtv/hdhrchannel.cpp	2009-07-08 09:56:37.974713672 -0700
+++ release-0-21-fixes/mythtv/libs/libmythtv/hdhrchannel.cpp	2009-07-10 10:43:36.301550972 -0700
@@ -41,6 +41,8 @@
     if (valid && hdhomerun_discover_validate_device_id(_device_id))
 	return;
 
+    _device_id = HDHOMERUN_DEVICE_ID_WILDCARD;
+
     /* Otherwise, is it a valid IP address? */
     struct in_addr address;
     if (inet_aton(device, &address)) 
@@ -53,7 +55,6 @@
     VERBOSE(VB_IMPORTANT, LOC_ERR + QString("Invalid DeviceID '%1'")
 	    .arg(device));
 
-    _device_id = HDHOMERUN_DEVICE_ID_WILDCARD;
 }
 
 HDHRChannel::~HDHRChannel(void)