Date: Sat, 16 Mar 2013 16:47:10 +0000 (UTC) From: Aleksandr Rybalko <ray@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r248377 - projects/efika_mx/sys/arm/freescale/imx Message-ID: <201303161647.r2GGlAOr028335@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ray Date: Sat Mar 16 16:47:10 2013 New Revision: 248377 URL: http://svnweb.freebsd.org/changeset/base/248377 Log: o Protect iomux API calls with check if iomuxsc initialized. o Fix typo in comment. Sponsored by: The FreeBSD Foundation Modified: projects/efika_mx/sys/arm/freescale/imx/imx51_iomux.c Modified: projects/efika_mx/sys/arm/freescale/imx/imx51_iomux.c ============================================================================== --- projects/efika_mx/sys/arm/freescale/imx/imx51_iomux.c Sat Mar 16 16:41:46 2013 (r248376) +++ projects/efika_mx/sys/arm/freescale/imx/imx51_iomux.c Sat Mar 16 16:47:10 2013 (r248377) @@ -128,7 +128,7 @@ iomux_attach(device_t dev) iomuxsc = sc; /* - * XXX: place to fetch all into about pinmuxing from loader data + * XXX: place to fetch all info about pinmuxing from loader data * (FDT blob) and apply. Loader (1st one) must care about * device-to-device difference. */ @@ -148,6 +148,9 @@ iomux_set_function_sub(struct iomux_soft void iomux_set_function(unsigned int pin, unsigned int fn) { + + if (iomuxsc == NULL) + return; iomux_set_function_sub(iomuxsc, pin, fn); } @@ -163,6 +166,9 @@ iomux_set_pad_sub(struct iomux_softc *sc void iomux_set_pad(unsigned int pin, unsigned int config) { + + if (iomuxsc == NULL) + return; iomux_set_pad_sub(iomuxsc, pin, config); } @@ -182,6 +188,8 @@ iomux_mux_config(const struct iomux_conf { int i; + if (iomuxsc == NULL) + return; for (i = 0; conflist[i].pin != IOMUX_CONF_EOT; i++) { iomux_set_pad_sub(iomuxsc, conflist[i].pin, conflist[i].pad); iomux_set_function_sub(iomuxsc, conflist[i].pin, @@ -195,6 +203,8 @@ iomux_input_config(const struct iomux_in { int i; + if (iomuxsc == NULL) + return; for (i = 0; conflist[i].inout != -1; i++) { iomux_set_inout(iomuxsc, conflist[i].inout, conflist[i].inout_mode);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303161647.r2GGlAOr028335>