Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'asoc-fix-cs4271' into asoc-cs4271

+4 -4
+1 -1
include/sound/cs4271.h
··· 19 19 20 20 struct cs4271_platform_data { 21 21 int gpio_nreset; /* GPIO driving Reset pin, if any */ 22 - int amutec_eq_bmutec:1; /* flag to enable AMUTEC=BMUTEC */ 22 + bool amutec_eq_bmutec; /* flag to enable AMUTEC=BMUTEC */ 23 23 }; 24 24 25 25 #endif /* __CS4271_H */
+3 -3
sound/soc/codecs/cs4271.c
··· 474 474 struct cs4271_platform_data *cs4271plat = codec->dev->platform_data; 475 475 int ret; 476 476 int gpio_nreset = -EINVAL; 477 - int amutec_eq_bmutec = 0; 477 + bool amutec_eq_bmutec = false; 478 478 479 479 #ifdef CONFIG_OF 480 480 if (of_match_device(cs4271_dt_ids, codec->dev)) { 481 481 gpio_nreset = of_get_named_gpio(codec->dev->of_node, 482 482 "reset-gpio", 0); 483 483 484 - if (!of_get_property(codec->dev->of_node, 484 + if (of_get_property(codec->dev->of_node, 485 485 "cirrus,amutec-eq-bmutec", NULL)) 486 - amutec_eq_bmutec = 1; 486 + amutec_eq_bmutec = true; 487 487 } 488 488 #endif 489 489