This is an automated email from Gerrit.

Artemiy Volkov ([email protected]) just uploaded a new patch set to Gerrit, 
which you can find at http://openocd.zylin.com/2504

-- gerrit

commit 74d087d11d7cf31d2cdc4bc30c500da17eff9bc5
Author: Artemiy Volkov <[email protected]>
Date:   Sat Jan 24 17:56:20 2015 +0300

    hla: check if the layout API doesn't implement speed() in hl_interface_khz()
    
    Fix a bug introduced in commit ab0432176c05d2c6109619bdb1d9944ee858334b
    ("hla: add ability to change adapter speed (if supported)") where openocd
    would segfault if we try to get the adapter speed when the layout API
    speed() method is not set.
    
    Change-Id: I5d8ba57ea9507634801af0fd6cfe7f557fcdfaf0
    Signed-off-by: Artemiy Volkov <[email protected]>

diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c
index c426f87..21cd06f 100644
--- a/src/jtag/hla/hla_interface.c
+++ b/src/jtag/hla/hla_interface.c
@@ -150,6 +150,9 @@ int hl_interface_init_reset(void)
 
 static int hl_interface_khz(int khz, int *jtag_speed)
 {
+       if (hl_if.layout->api->speed == NULL)
+               return ERROR_OK;
+
        *jtag_speed = hl_if.layout->api->speed(hl_if.handle, khz, true);
        return ERROR_OK;
 }

-- 

------------------------------------------------------------------------------
New Year. New Location. New Benefits. New Data Center in Ashburn, VA.
GigeNET is offering a free month of service with a new server in Ashburn.
Choose from 2 high performing configs, both with 100TB of bandwidth.
Higher redundancy.Lower latency.Increased capacity.Completely compliant.
http://p.sf.net/sfu/gigenet
_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel

Reply via email to