Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

mraa.c: Fix mraa_init with usb subplatform

Browse Source 
This fix only affects USBPLAT=ON which would cause mraa_init to return
uninitialised if we had detected a platform. Whilst the initialisation had
actually been done correctly the results would be that platform_name was
unfilled and no iio initialisation was done

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2016-02-11 10:16:58 +00:00
parent 1f57c6c082
commit d04911d569
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mraa.c
View File

@@ -131,13 +131,13 @@ mraa_init()
plat->platform_name = "Unknown platform";
}
}
// Now detect sub platform
// Now detect sub platform, note this is not an else since we could be in
// an error case and fall through to MRAA_ERROR_PLATFORM_NOT_INITIALISED
if (plat != NULL) {
mraa_platform_t usb_platform_type = mraa_usb_platform_extender(plat);
// if we have no known platform just replace usb platform with platform
if (plat->platform_type == MRAA_UNKNOWN_PLATFORM && usb_platform_type != MRAA_UNKNOWN_PLATFORM) {
plat->platform_type = usb_platform_type;
} else {
return MRAA_ERROR_PLATFORM_NOT_INITIALISED;
}
}
if (plat == NULL) {