[svn-commits] tzafrir: linux/trunk r9430 - /linux/trunk/drivers/dahdi/xpp/init_card_4_30

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon Oct 18 09:50:03 2010
New Revision: 9430

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9430
Log:
xpp: Fixes init error for PRI devices with < 4 ports

Fixes a regression singce r8873: if pri_protocol is not explicitly set
(in /etc/dahdi/xpp.conf) and the device has (licences for) less than 4
"PRI" (E1/T1) ports, the initialization script will attempt to read from
a non-existing SysFS file, and bail out, resulting in a the device
failing to initialize.

For those non-existing ports we can just skip that part of the
initialization. So we just skip it.

Work around: explicitly set pri_protocol to E1 or T1, as needed.

Xorcom Rev: 8047. Ticket: 1334.

Modified:
    linux/trunk/drivers/dahdi/xpp/init_card_4_30

Modified: linux/trunk/drivers/dahdi/xpp/init_card_4_30
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/init_card_4_30?view=diff&rev=9430&r1=9429&r2=9430
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/init_card_4_30 (original)
+++ linux/trunk/drivers/dahdi/xpp/init_card_4_30 Mon Oct 18 09:50:03 2010
@@ -348,7 +348,7 @@
 	} else {
 		my $file = sprintf "/sys/bus/xpds/devices/%02d:%1d:%1d/pri_protocol",
 				$ENV{XBUS_NUMBER}, $ENV{UNIT_NUMBER}, $portno;
-		open(F, $file) || die "$0: Failed opening '$file'";
+		open(F, $file) || return;
 		$sysfs_pri_protocol = <F>;
 		close F;
 		chomp $sysfs_pri_protocol;