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

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

Merge "power: smb1381: Fix NULL pointer dereference for audio adapter"

parents d69f47b7 0b8eb711

drivers/power/supply/qcom/smb138x-charger.c

+6 −0
Original line number Diff line number Diff line
@@ -117,6 +117,11 @@ module_param_named( 
	try_sink_enabled, __try_sink_enabled, int, 0600

);



static int __audio_headset_drp_wait_ms = 100;

	module_param_named(

	audio_headset_drp_wait_ms, __audio_headset_drp_wait_ms, int, 0600

);



static irqreturn_t smb138x_handle_slave_chg_state_change(int irq, void *data)

{

	struct smb_irq_data *irq_data = data;
@@ -1786,6 +1791,7 @@ static int smb138x_probe(struct platform_device *pdev) 
	chip->chg.try_sink_enabled = &__try_sink_enabled;

	chip->chg.irq_info = smb138x_irqs;

	chip->chg.name = "SMB";

	chip->chg.audio_headset_drp_wait_ms = &__audio_headset_drp_wait_ms;



	chip->chg.regmap = dev_get_regmap(chip->chg.dev->parent, NULL);

	if (!chip->chg.regmap) {