r4505 - trunk/src/target/gsm/src/gsmd

[laforge at docs.openmoko.org]

Author: laforge
Date: 2008-07-03 18:23:41 +0200 (Thu, 03 Jul 2008)
New Revision: 4505

Modified:
   trunk/src/target/gsm/src/gsmd/gsmd.c
Log:
* fix segfault with generic machine plugin (by Jamal Selim)

the generic machine plugin doesn't have initsettings, therefore we cannot
blindly assume it exists.


Modified: trunk/src/target/gsm/src/gsmd/gsmd.c
===================================================================
--- trunk/src/target/gsm/src/gsmd/gsmd.c	2008-06-30 00:55:00 UTC (rev 4504)
+++ trunk/src/target/gsm/src/gsmd/gsmd.c	2008-07-03 16:23:41 UTC (rev 4505)
@@ -198,7 +198,8 @@
 
 	if (gsmd->vendorpl && gsmd->vendorpl->initsettings){
 		rc |= gsmd->vendorpl->initsettings(gsmd);
-		rc |= gsmd->machinepl->initsettings(gsmd);
+		if (gsmd->machinepl && gsmd->machinepl->initsettings)
+			rc |= gsmd->machinepl->initsettings(gsmd);
 		return rc;
 	}	
 	else