summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlaforge <laforge@99fdad57-331a-0410-800a-d7fa5415bdb3>2008-07-03 16:23:41 +0000
committerlaforge <laforge@99fdad57-331a-0410-800a-d7fa5415bdb3>2008-07-03 16:23:41 +0000
commit45973084b27f4540ecc9a19117cad9bf9230bdc5 (patch)
tree46d43ae9b2ba91faf8305ea82b4afaa644bdb29a
parenta5668a610b1ff9d2196ef11aeb3f4633dda22dd7 (diff)
* fix segfault with generic machine plugin (by Jamal Selim)
the generic machine plugin doesn't have initsettings, therefore we cannot blindly assume it exists. git-svn-id: http://svn.openmoko.org/trunk/src/target/gsm@4505 99fdad57-331a-0410-800a-d7fa5415bdb3
-rw-r--r--src/gsmd/gsmd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gsmd/gsmd.c b/src/gsmd/gsmd.c
index 44dac60..58d92e3 100644
--- a/src/gsmd/gsmd.c
+++ b/src/gsmd/gsmd.c
@@ -198,7 +198,8 @@ static int gsmd_initsettings2(struct gsmd *gsmd)
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
personal git repositories of Harald Welte. Your mileage may vary