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

Commit d00f5004 authored by Anton Tikhomirov's avatar Anton Tikhomirov Committed by Greg Kroah-Hartman
Browse files

USB: s3c-hsotg: Fix core reset 



This patch fixes code responsible for core reset.

Signed-off-by: default avatarAnton Tikhomirov <av.tikhomirov@samsung.com>
Reviewed-by: default avatarKyoungil <Kim&lt;ki0351.kim@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 83722bc9

drivers/usb/gadget/s3c-hsotg.c

+2 −5
Original line number Diff line number Diff line
@@ -2491,9 +2491,9 @@ static int s3c_hsotg_corereset(struct s3c_hsotg *hsotg) 
	timeout = 1000;

	do {

		grstctl = readl(hsotg->regs + S3C_GRSTCTL);

	} while (!(grstctl & S3C_GRSTCTL_CSftRst) && timeout-- > 0);

	} while ((grstctl & S3C_GRSTCTL_CSftRst) && timeout-- > 0);



	if (!(grstctl & S3C_GRSTCTL_CSftRst)) {

	if (grstctl & S3C_GRSTCTL_CSftRst) {

		dev_err(hsotg->dev, "Failed to get CSftRst asserted\n");

		return -EINVAL;

	}
@@ -2510,9 +2510,6 @@ static int s3c_hsotg_corereset(struct s3c_hsotg *hsotg) 
			return -ETIMEDOUT;

		}



		if (grstctl & S3C_GRSTCTL_CSftRst)

			continue;



		if (!(grstctl & S3C_GRSTCTL_AHBIdle))

			continue;