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

Commit 3346b836 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: ci13xxx_msm: shutdown callback to disable D+ pullup"

parents 7bbe4cc2 6525935d

drivers/usb/gadget/ci13xxx_msm.c

+7 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -377,6 +377,11 @@ int ci13xxx_msm_remove(struct platform_device *pdev) 
	return 0;

}



void ci13xxx_msm_shutdown(struct platform_device *pdev)

{

	ci13xxx_pullup(&_udc->gadget, 0);

}



void msm_hw_bam_disable(bool bam_disable)

{

	u32 val;
@@ -396,6 +401,7 @@ static struct platform_driver ci13xxx_msm_driver = { 
		.name = "msm_hsusb",

	},

	.remove = ci13xxx_msm_remove,

	.shutdown = ci13xxx_msm_shutdown,

};

MODULE_ALIAS("platform:msm_hsusb");