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

Commit 50de6be7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "usb: typec: bus: verify partner exists in typec_altmode_attention" 



This reverts commit 5f717167 which is
commit f23643306430f86e2f413ee2b986e0773e79da31 upstream.

It breaks the Android abi.  It will be brought back later, in an
ABI-safe way, but for now drop it.

Bug: 161946584
Change-Id: I5cc20208598b89d9a80d2b0cbaaa6492e35392bf
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 13c2fe5c

drivers/usb/typec/bus.c

+2 −10
Original line number Diff line number Diff line
@@ -146,20 +146,12 @@ EXPORT_SYMBOL_GPL(typec_altmode_exit); 
 *

 * Notifies the partner of @adev about Attention command.

 */

int typec_altmode_attention(struct typec_altmode *adev, u32 vdo)

void typec_altmode_attention(struct typec_altmode *adev, u32 vdo)

{

	struct altmode *partner = to_altmode(adev)->partner;

	struct typec_altmode *pdev;



	if (!partner)

		return -ENODEV;



	pdev = &partner->adev;

	struct typec_altmode *pdev = &to_altmode(adev)->partner->adev;



	if (pdev->ops && pdev->ops->attention)

		pdev->ops->attention(pdev, vdo);



	return 0;

}

EXPORT_SYMBOL_GPL(typec_altmode_attention);

drivers/usb/typec/tcpm/tcpm.c

+1 −2
Original line number Diff line number Diff line
@@ -1246,8 +1246,7 @@ static void tcpm_handle_vdm_request(struct tcpm_port *port, 
			}

			break;

		case ADEV_ATTENTION:

			if (typec_altmode_attention(adev, p[1]))

				tcpm_log(port, "typec_altmode_attention no port partner altmode");

			typec_altmode_attention(adev, p[1]);

			break;

		}

	}

include/linux/usb/typec_altmode.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct typec_altmode_ops { 


int typec_altmode_enter(struct typec_altmode *altmode);

int typec_altmode_exit(struct typec_altmode *altmode);

int typec_altmode_attention(struct typec_altmode *altmode, u32 vdo);

void typec_altmode_attention(struct typec_altmode *altmode, u32 vdo);

int typec_altmode_vdm(struct typec_altmode *altmode,

		      const u32 header, const u32 *vdo, int count);

int typec_altmode_notify(struct typec_altmode *altmode, unsigned long conf,