Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc0808f0 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

mmc: host: omap_hsmmc: checking for NULL instead of IS_ERR() 




[ Upstream commit ec5ab8933772c87f24ad62a4a602fe8949f423c2 ]

devm_pinctrl_get() returns error pointers, it never returns NULL.

Fixes: 455e5cd6 ("mmc: omap_hsmmc: Pin remux workaround to support SDIO interrupt on AM335x")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c84d2e72

drivers/mmc/host/omap_hsmmc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1757,8 +1757,8 @@ static int omap_hsmmc_configure_wake_irq(struct omap_hsmmc_host *host) 
	 */

	 */

	if (host->pdata->controller_flags & OMAP_HSMMC_SWAKEUP_MISSING) {

	if (host->pdata->controller_flags & OMAP_HSMMC_SWAKEUP_MISSING) {

		struct pinctrl *p = devm_pinctrl_get(host->dev);

		struct pinctrl *p = devm_pinctrl_get(host->dev);

		if (!p) {

		if (IS_ERR(p)) {

			ret = -ENODEV;

			ret = PTR_ERR(p);

			goto err_free_irq;

			goto err_free_irq;

		}

		}

		if (IS_ERR(pinctrl_lookup_state(p, PINCTRL_STATE_DEFAULT))) {

		if (IS_ERR(pinctrl_lookup_state(p, PINCTRL_STATE_DEFAULT))) {