diff mbox

typec: tcpm: Fix a msecs vs jiffies bug

Message ID 20180607131714.hjpd7xdhcpzntkob@kili.mountain (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter June 7, 2018, 1:17 p.m. UTC 
The tcpm_set_state() function take msecs not jiffies.

Fixes: f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Heikki Krogerus June 7, 2018, 1:25 p.m. UTC | #1 
On Thu, Jun 07, 2018 at 04:17:14PM +0300, Dan Carpenter wrote:
> The tcpm_set_state() function take msecs not jiffies.
> 
> Fixes: f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c
> index 8a201dd53d36..0dfd755020f4 100644
> --- a/drivers/usb/typec/tcpm.c
> +++ b/drivers/usb/typec/tcpm.c
> @@ -3043,7 +3043,8 @@ static void run_state_machine(struct tcpm_port *port)
>  		    tcpm_port_is_sink(port) &&
>  		    time_is_after_jiffies(port->delayed_runtime)) {
>  			tcpm_set_state(port, SNK_DISCOVERY,
> -				       port->delayed_runtime - jiffies);
> +				       jiffies_to_msecs(port->delayed_runtime -
> +							jiffies));
>  			break;
>  		}
>  		tcpm_set_state(port, unattached_state(port), 0);
Guenter Roeck June 8, 2018, 6:13 a.m. UTC | #2 
On Thu, Jun 7, 2018 at 6:17 AM Dan Carpenter <dan.carpenter@oracle.com> wrote:
>
> The tcpm_set_state() function take msecs not jiffies.
>

Nice catch.

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> Fixes: f0690a25a140 ("staging: typec: USB Type-C Port Manager (tcpm)")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c
> index 8a201dd53d36..0dfd755020f4 100644
> --- a/drivers/usb/typec/tcpm.c
> +++ b/drivers/usb/typec/tcpm.c
> @@ -3043,7 +3043,8 @@ static void run_state_machine(struct tcpm_port *port)
>                     tcpm_port_is_sink(port) &&
>                     time_is_after_jiffies(port->delayed_runtime)) {
>                         tcpm_set_state(port, SNK_DISCOVERY,
> -                                      port->delayed_runtime - jiffies);
> +                                      jiffies_to_msecs(port->delayed_runtime -
> +                                                       jiffies));
>                         break;
>                 }
>                 tcpm_set_state(port, unattached_state(port), 0);
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c
index 8a201dd53d36..0dfd755020f4 100644
--- a/drivers/usb/typec/tcpm.c
+++ b/drivers/usb/typec/tcpm.c
@@ -3043,7 +3043,8 @@  static void run_state_machine(struct tcpm_port *port)
 		    tcpm_port_is_sink(port) &&
 		    time_is_after_jiffies(port->delayed_runtime)) {
 			tcpm_set_state(port, SNK_DISCOVERY,
-				       port->delayed_runtime - jiffies);
+				       jiffies_to_msecs(port->delayed_runtime -
+							jiffies));
 			break;
 		}
 		tcpm_set_state(port, unattached_state(port), 0);