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

Commit eafd71a5 authored by Channagoud Kadabi's avatar Channagoud Kadabi Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: wcd: remove deprecated input prop" into msm-4.8

parents 1af675df 9870662b

sound/soc/codecs/wcd-mbhc-v2.c

+0 −3
Original line number Diff line number Diff line
@@ -2455,9 +2455,6 @@ int wcd_mbhc_init(struct wcd_mbhc *mbhc, struct snd_soc_codec *codec, 
			return ret;

		}



		set_bit(INPUT_PROP_NO_DUMMY_RELEASE,

			mbhc->button_jack.jack->input_dev->propbit);



		INIT_DELAYED_WORK(&mbhc->mbhc_firmware_dwork,

				  wcd_mbhc_fw_read);

		INIT_DELAYED_WORK(&mbhc->mbhc_btn_dwork, wcd_btn_lpress_fn);

sound/soc/codecs/wcd9xxx-mbhc.c

+0 −3
Original line number Diff line number Diff line
@@ -5536,9 +5536,6 @@ int wcd9xxx_mbhc_init(struct wcd9xxx_mbhc *mbhc, struct wcd9xxx_resmgr *resmgr, 
			return ret;

		}



		set_bit(INPUT_PROP_NO_DUMMY_RELEASE,

			mbhc->button_jack.jack->input_dev->propbit);



		INIT_DELAYED_WORK(&mbhc->mbhc_firmware_dwork,

				  wcd9xxx_mbhc_fw_read);

		INIT_DELAYED_WORK(&mbhc->mbhc_btn_dwork, wcd9xxx_btn_lpress_fn);