January 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [RFC V2 0/2] ASoC: img: Add Pistachio card support
by Damien Horsley 29 Jan '16

29 Jan '16

From: "Damien.Horsley" <Damien.Horsley(a)imgtec.com> This patch set provides an initial implementation of a card driver suitable for all boards that use of the Pistachio SoC The Pistachio SoC contains the following audio components: Controllers - SPDIF out, SPDIF in, parallel out, I2S out, I2S in Codecs - Internal DAC (connected to parallel out) Clocks - Audio PLL, dividers, gates, codec system clocks There are a number of boards that use the Pistachio SoC. The following can vary from board to board: - Which audio interfaces are usable on the board - The I2S codecs used (including multicodec paths on some boards) - The use of the two system clocks by the I2S codecs - Other external audio components present on the board - I2S clock loopback - I2S formats - Sample rates For some boards, a single system clock is used by components on both the I2S out and I2S in paths. This creates two dependacy issues that require further review as follows: - The information required to control the system clock rate(s) in response to a sample rate change cannot be specified as a single frequency, or as a single fs-ratio. Instead, the Pistachio card driver must store sufficient information to derive acceptable system clock rate(s) for any usable combination of {I2S out sample rate, I2S in sample rate} In this revision, the information is specified as a per-codec list of fs-rates, accompanied by min/max frequencies. This specification is sufficient for the codecs used so far, but this likely needs to change to support a greater range of codecs. - In order for the Pistachio card driver to establish usable system clock rate(s) for a given combination of {I2S out sample rate, I2S in sample rate}, the card driver must be made aware of both of the sample rate requirements in advance of either of the streams starting, as system clock rates cannot typically be changed when a codec is actively playing/recording. For this revision of the Pistachio card driver, a control has been used to specify these rates in advance. Calls to hw_params that require a system clock to change rate when another stream is already using the clock fail with -EBUSY. Changes in V2: - Added COMMON_CLK dependancy in Kconfig Damien.Horsley (2): ASoC: img: Add binding document for Pistachio audio card ASoC: img: Add driver for Pistachio audio card .../bindings/sound/img,pistachio-audio.txt | 308 +++ include/dt-bindings/sound/pistachio-audio.h | 7 + sound/soc/img/Kconfig | 11 + sound/soc/img/Makefile | 1 + sound/soc/img/pistachio.c | 2249 ++++++++++++++++++++ 5 files changed, 2576 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/img,pistachio-audio.txt create mode 100644 include/dt-bindings/sound/pistachio-audio.h create mode 100644 sound/soc/img/pistachio.c -- 2.1.4

2 9

[alsa-devel] Applied "ASoC: rt5616: add mclk property for rt5616 document" to the asoc tree
by Mark Brown 28 Jan '16

28 Jan '16

The patch ASoC: rt5616: add mclk property for rt5616 document has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From dcaee813a64368e09878d0cee931d14c9603e925 Mon Sep 17 00:00:00 2001 From: Caesar Wang <wxt(a)rock-chips.com> Date: Thu, 28 Jan 2016 16:43:35 +0800 Subject: [PATCH] ASoC: rt5616: add mclk property for rt5616 document This patch add the mclk property for the CODEC driver, since sometime the CODEC driver needs the clock enabled. The system clock of ALC5616 can be selected from MCLK, That's also make as the codec master clock provider, Signed-off-by: Caesar Wang <wxt(a)rock-chips.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Documentation/devicetree/bindings/sound/rt5616.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/rt5616.txt b/Documentation/devicetree/bindings/sound/rt5616.txt index efc48c6..e410858 100644 --- a/Documentation/devicetree/bindings/sound/rt5616.txt +++ b/Documentation/devicetree/bindings/sound/rt5616.txt @@ -8,6 +8,12 @@ Required properties: - reg : The I2C address of the device. +Optional properties: + +- clocks: The phandle of the master clock to the CODEC. + +- clock-names: Should be "mclk". + Pins on the device (for linking into audio routes) for RT5616: * IN1P -- 2.6.4

1 0

[alsa-devel] [PATCH v4 0/9] Add the family patches to support for kylin board
by Caesar Wang 28 Jan '16

28 Jan '16

Hi all, This series patches are based on kernel 4.5-rc1 version, also is based on Heiko's branch. (kernel/git/mmind/linux-rockchip.git -b for-next & v4.5-clk/fixes) e.g: boot log.. Linux version 4.5.0-rc1+ (wxt@ubuntu) ....#60 SMP Thu Jan 28 12:54:50 CST 2016 1) The kylin history series patches: V0: https://lkml.org/lkml/2015/12/22/168 V1: https://lkml.org/lkml/2015/12/17/319 V2: https://lkml.org/lkml/2016/1/7/66 V3: http://www.spinics.net/lists/arm-kernel/msg474796.html This series patches are verified on the following github: https://github.com/Caesar-github/rockchip/tree/kylin/next This series has 9 patches: (9--->1) c455bf5 ARM: dts: rockchip: support the spi for rk3036 41bbd5d ASoC: rt5616: add the mclk for the codec driver 6ee2dc0 ASoC: rt5616: trivial: fix the typo 2775e41 ASoC: rt5616: add mclk property for rt5616 document b4ec10b ARM: dts: rockchip: add mclk for rt5616 on kylin board 8d272a1 ARM: dts: rockchip: add support emac for RK3036 02e501f clk: rockchip: rk3036: fix and add node id for emac clock b948f42 ARM: dts: rockchip: add hdmi/vop device node for rk3036 fa45230 ARM: dts: rockchip: add the leds control for kylin board .... This series patches can apply into Heiko for-next branch. (https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/log/?…) Also, ths ASoC can apply into Mark branch. --- 2) This series patches have the following decriptions: PATCH[1/9]: Add the leds control on kylin board. ARM: dts: rockchip: add the leds control for kylin board PATCH[2/9]: ====> add hdmi/vop display node for rk3036 ARM: dts: rockchip: add hdmi/vop device node for rk3036 This Patch is based on Ykk's Inno HDMI V7 patches. That's verified on my github. bd5ed3e ARM: dts: rockchip: add hdmi/vop device node for rk3036 438e7bd FROMLIST: dt-bindings: add document for Innosilicon HDMI on Rockchip platform ((am from https://patchwork.kernel.org/patch/8117611/)) ad0623b FROMLIST: drm/rockchip: hdmi: add Innosilicon HDMI support ((am https://patchwork.kernel.org/patch/8117571/)) PATCH[3/9-4/9]: Add the emac patch The emac clock is depend APLL, That shoud be incorrect. We should fix it on the DPLL. df91ab ARM: dts: rockchip: add support emac for RK3036 d5c2781 clk: rockchip: rk3036: fix and add node id for emac clock That's verified on kylin board with ubuntu os. How to test and verify? You can refer to the following wiki document. http://rockchip.wikidot.com/kylin PATCH[5/9-8/9]: Make the codec work on kylin board 41bbd5d ASoC: rt5616: add the mclk for the codec driver 6ee2dc0 ASoC: rt5616: trivial: fix the typo 2775e41 ASoC: rt5616: add mclk property for rt5616 document b4ec10b ARM: dts: rockchip: add mclk for rt5616 on kylin board As the previous discussed on https://patchwork.kernel.org/patch/8041001/ Move the mclk into codec driver to enable and disable. How to test and verify? You can refer to the following wiki document. http://rockchip.wikidot.com/kylin PATCH[9/9]: Make the codec work on kylin board Add the spi node for rk3036 dts, that's seem not related to the kylin. Maybe the future will support the spi on kylin board or connect the spi devices. f0fff43 ARM: dts: rockchip: support the spi for rk3036 --- Thanks your reviewing! - Caesar Changes in v4: - Add the missing led control on kylin board. - This patch picks up at this URL. (https://patchwork.kernel.org/patch/8129971/) - solve the lastest conflict, picked up from https://patchwork.kernel.org/patch/8040961/. - fix the commit, pick up from the https://patchwork.kernel.org/patch/7976631/. - The emac parent shouldn't depend on the APLL. instead of DPLL. - included in the kylin series patches. - This patch picked up from https://patchwork.kernel.org/patch/7924971/ - Change to solve the conflict based on the Heiko's branch. - Make the emac parent as the DPLL. - AS the previous discussed by them, add the mclk for codec. (https://patchwork.kernel.org/patch/8041001/) - Add this patch included in kylin series patches. - Add this patch included in kylin series patches. - AS the previous discussed by them, add the mclk for codec. (https://patchwork.kernel.org/patch/8041001/) - Add this patch included in kylin series patches. Caesar Wang (7): ARM: dts: rockchip: add the leds control for kylin board ARM: dts: rockchip: add hdmi/vop device node for rk3036 ARM: dts: rockchip: add mclk for rt5616 on kylin board ASoC: rt5616: add mclk property for rt5616 document ASoC: rt5616: trivial: fix the typo ASoC: rt5616: add the mclk for the codec driver ARM: dts: rockchip: support the spi for rk3036 zhengxing (2): clk: rockchip: rk3036: fix and add node id for emac clock ARM: dts: rockchip: add support emac for RK3036 Documentation/devicetree/bindings/sound/rt5616.txt | 6 + arch/arm/boot/dts/rk3036-evb.dts | 23 ++ arch/arm/boot/dts/rk3036-kylin.dts | 52 +++ arch/arm/boot/dts/rk3036.dtsi | 147 ++++++++ drivers/clk/rockchip/clk-rk3036.c | 9 +- include/dt-bindings/clock/rk3036-cru.h | 2 + sound/soc/codecs/rt5616.c | 410 +++++++++++---------- 7 files changed, 461 insertions(+), 188 deletions(-) -- 1.9.1

2 4

[alsa-devel] CherryTrail SST firmware limitations query
by Dan O'Donovan 28 Jan '16

28 Jan '16

(Sorry, re-sending as I wasn't subscribed to the alsa-devel mailing list on my previous attempt) Hi Vinod I am currently attempting to use the SSP0 port on an Intel X5-Z8300 SoC (Cherry Trail) with a new codec. I have seen that you have committed SST firmware 'fw_sst_22a8.bin' and related SST audio soc drivers in the past, so I hope you don't mind if I ask you some questions about it here. Primarily, I am wondering if there are any limitations imposed by that firmware binary that I need to be aware of. I haven't been able to find much information about what this firmware does or doesn't support. For example, existing CHT SST machine drivers suggest that the PCM bit clock is fixed at 19.2MHz. Also, I am wondering if all SSP ports on the SoC are supported by that firmware, or if it is limited to just SSP2? Are there any other limitations that I may need to be aware of in the firmware (or in the SSP back-end driver) when attempting to connect a new codec (TI PCM5122 initially) to SSP0. Many thanks in advance for any help/advice you can provide. Best regards, -Dan

3 4

[alsa-devel] [PATCH v3] amixer: skip showing asoc tlv byte controls
by Vinod Koul 28 Jan '16

28 Jan '16

ASoC TLV Byte controls are very large size controls so we should add new options for these. So skip dumping contents for these. $amixer -c0 cget numid=16 numid=16,iface=MIXER,name='mdl params' ; type=BYTES,access=-----RW-,values=30336 : ASoC TLV Byte control, skipping bytes dump Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- amixer/amixer.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/amixer/amixer.c b/amixer/amixer.c index db1849333da3..e059c176f958 100644 --- a/amixer/amixer.c +++ b/amixer/amixer.c @@ -682,6 +682,14 @@ static int show_control(const char *space, snd_hctl_elem_t *elem, __skip_read: if (!snd_ctl_elem_info_is_tlv_readable(info)) goto __skip_tlv; + /* skip ASoC ext bytes controls that may have huge binary TLV data */ + if (type == SND_CTL_ELEM_TYPE_BYTES && + !snd_ctl_elem_info_is_readable(info) && + !snd_ctl_elem_info_is_writable(info)) { + printf("%s: ASoC TLV Byte control, skipping bytes dump\n", space); + goto __skip_tlv; + } + tlv = malloc(4096); if ((err = snd_hctl_elem_tlv_read(elem, tlv, 4096)) < 0) { error("Control %s element TLV read error: %s\n", card, snd_strerror(err)); -- 1.9.1

2 2

[alsa-devel] sound: heap out-of-bounds write in dummy_systimer_prepare
by Dmitry Vyukov 28 Jan '16

28 Jan '16

Hello, I've got the following report while running syzkaller fuzzer: ================================================================== BUG: KASAN: slab-out-of-bounds in dummy_systimer_prepare+0x268/0x2a0 at addr ffff88006067aa30 Write of size 4 by task syz-executor/5841 ============================================================================= BUG kmalloc-192 (Not tainted): kasan: bad access detected ----------------------------------------------------------------------------- INFO: Allocated in dummy_hrtimer_create+0x49/0x1a0 age=77 cpu=2 pid=5841 [< inline >] slab_alloc_node mm/slub.c:2562 [< inline >] slab_alloc mm/slub.c:2604 [< none >] kmem_cache_alloc_trace+0x25c/0x300 mm/slub.c:2621 [< inline >] kmalloc include/linux/slab.h:463 [< inline >] kzalloc include/linux/slab.h:607 [< none >] dummy_hrtimer_create+0x49/0x1a0 sound/drivers/dummy.c:458 [< none >] dummy_pcm_open+0xef/0x570 sound/drivers/dummy.c:573 [< none >] snd_pcm_open_substream+0x188/0x430 sound/core/pcm_native.c:2264 [< inline >] snd_pcm_oss_open_file sound/core/oss/pcm_oss.c:2342 [< none >] snd_pcm_oss_open.part.17+0x5a4/0x1110 sound/core/oss/pcm_oss.c:2424 [< none >] snd_pcm_oss_open+0x35/0x50 sound/core/oss/pcm_oss.c:2388 [< none >] soundcore_open+0x30f/0x640 sound/sound_core.c:639 [< none >] chrdev_open+0x22a/0x4c0 fs/char_dev.c:388 [< none >] do_dentry_open+0x6a2/0xcb0 fs/open.c:736 [< none >] vfs_open+0x17b/0x1f0 fs/open.c:853 [< inline >] do_last fs/namei.c:3254 [< none >] path_openat+0xde9/0x5e30 fs/namei.c:3386 [< none >] do_filp_open+0x18e/0x250 fs/namei.c:3421 [< none >] do_sys_open+0x1fc/0x420 fs/open.c:1022 [< inline >] SYSC_open fs/open.c:1040 [< none >] SyS_open+0x2d/0x40 fs/open.c:1035 INFO: Slab 0xffffea0001819e00 objects=24 used=20 fp=0xffff8800606799f0 flags=0x5fffc0000004080 INFO: Object 0xffff88006067a980 @offset=10624 fp=0x (null) CPU: 2 PID: 5841 Comm: syz-executor Tainted: G B 4.5.0-rc1+ #291 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 00000000ffffffff ffff8800316af4c8 ffffffff829e798d ffff88003e804c00 ffff88006067a980 ffff880060678000 ffff8800316af4f8 ffffffff8175b394 ffff88003e804c00 ffffea0001819e00 ffff88006067a980 0000000000008002 Call Trace: [< inline >] kasan_report mm/kasan/report.c:274 [<ffffffff81764ebe>] __asan_report_store4_noabort+0x3e/0x40 mm/kasan/report.c:299 [<ffffffff850dc078>] dummy_systimer_prepare+0x268/0x2a0 sound/drivers/dummy.c:295 [<ffffffff850dc52b>] dummy_pcm_prepare+0x7b/0xa0 sound/drivers/dummy.c:512 [<ffffffff8505159a>] snd_pcm_do_prepare+0x5a/0x90 sound/core/pcm_native.c:1512 [<ffffffff85050886>] snd_pcm_action_single+0x76/0x120 sound/core/pcm_native.c:944 [<ffffffff85050c85>] snd_pcm_action_nonatomic+0x95/0xa0 sound/core/pcm_native.c:1011 [< inline >] snd_pcm_prepare sound/core/pcm_native.c:1552 [<ffffffff8505bbd5>] snd_pcm_common_ioctl1+0x1045/0x21a0 sound/core/pcm_native.c:2765 [<ffffffff8505cfd2>] snd_pcm_playback_ioctl1+0x2a2/0x5e0 sound/core/pcm_native.c:2884 [<ffffffff8505dad6>] snd_pcm_kernel_ioctl+0x136/0x160 sound/core/pcm_native.c:3004 [<ffffffff8508bb4b>] snd_pcm_oss_prepare+0x4b/0x200 sound/core/oss/pcm_oss.c:1112 [<ffffffff850941ee>] snd_pcm_oss_make_ready+0xae/0x120 sound/core/oss/pcm_oss.c:1140 [<ffffffff85096d5a>] snd_pcm_oss_sync+0xba/0xa30 sound/core/oss/pcm_oss.c:1609 [<ffffffff8509787d>] snd_pcm_oss_release+0x1ad/0x280 sound/core/oss/pcm_oss.c:2479 [<ffffffff817c0096>] __fput+0x236/0x780 fs/file_table.c:208 [<ffffffff817c0665>] ____fput+0x15/0x20 fs/file_table.c:244 [<ffffffff813b13c0>] task_work_run+0x170/0x210 kernel/task_work.c:115 [< inline >] exit_task_work include/linux/task_work.h:21 [<ffffffff8135ca55>] do_exit+0x8b5/0x2cb0 kernel/exit.c:748 [<ffffffff8135efc8>] do_group_exit+0x108/0x330 kernel/exit.c:878 [<ffffffff81382114>] get_signal+0x5e4/0x14f0 kernel/signal.c:2307 [<ffffffff811a0db3>] do_signal+0x83/0x1c90 arch/x86/kernel/signal.c:712 [<ffffffff81006685>] exit_to_usermode_loop+0x1a5/0x210 arch/x86/entry/common.c:247 [< inline >] prepare_exit_to_usermode arch/x86/entry/common.c:282 [<ffffffff810084ea>] syscall_return_slowpath+0x2ba/0x340 arch/x86/entry/common.c:344 [<ffffffff86459c22>] int_ret_from_sys_call+0x25/0x9f arch/x86/entry/entry_64.S:281 Memory state around the buggy address: ffff88006067a900: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc ffff88006067a980: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 >ffff88006067aa00: 00 00 00 00 00 fc fc fc fc fc fc fc fc fc fc fc ^ ffff88006067aa80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc ffff88006067ab00: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc ================================================================== The timer is created by dummy_hrtimer_create as hrtimer, but then accessed by dummy_systimer_prepare as systimer. The root cause seems to be a data race on dummy->timer_ops which is reinitialized while it is being used already. The race in turn causes type confusion. Which in turn causes heap overwrite with known values. I was able to reproduce this by working with sound devices and doing "echo -n N > /sys/module/snd_dummy/parameters/hrtimer" concurrently. But I am sure that syzkaller did not do writes to sysfs when this bug was triggered, not sure what altered hrtimer variable in that case. Or do you see any other possibilities for this issue to be triggered? On commit e2464688b59c6ae9928f385dabf5355e30cff298.

2 2

[alsa-devel] [PATCH v2] amixer: skip showing asoc tlv byte controls
by Vinod Koul 28 Jan '16

28 Jan '16

ASoC TLV Byte controls are very large size controls so we should add new options for these. So skip dumping contents for these. $amixer -c0 cget numid=16 numid=16,iface=MIXER,name='mdl params' ; type=BYTES,access=-----RW-,values=30336 : ASoC TLV Byte control, skipping bytes dump Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- amixer/amixer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/amixer/amixer.c b/amixer/amixer.c index db1849333da3..9ae75bfa3632 100644 --- a/amixer/amixer.c +++ b/amixer/amixer.c @@ -682,6 +682,12 @@ static int show_control(const char *space, snd_hctl_elem_t *elem, __skip_read: if (!snd_ctl_elem_info_is_tlv_readable(info)) goto __skip_tlv; + /* skip show for ASoC TLV Byte controls */ + if (type == SND_CTL_ELEM_TYPE_BYTES) { + printf("%s: ASoC TLV Byte control, skipping bytes dump\n", space); + goto __skip_tlv; + } + tlv = malloc(4096); if ((err = snd_hctl_elem_tlv_read(elem, tlv, 4096)) < 0) { error("Control %s element TLV read error: %s\n", card, snd_strerror(err)); -- 1.9.1

2 3

[alsa-devel] [PATCH] sound: fix SND_PCM_TIMER Kconfig text
by Randy Dunlap 28 Jan '16

28 Jan '16

From: Randy Dunlap <rdunlap(a)infradead.org> Fix spelling and typos for SND_PCM_TIMER. Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Jie Yang <yang.jie(a)intel.com> Cc: Takashi Iwai <tiwai(a)suse.de> --- sound/core/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- lnx-45-rc1.orig/sound/core/Kconfig +++ lnx-45-rc1/sound/core/Kconfig @@ -97,11 +97,11 @@ config SND_PCM_TIMER bool "PCM timer interface" if EXPERT default y help - If you disable this option, pcm timer will be inavailable, so - those stubs used pcm timer (e.g. dmix, dsnoop & co) may work + If you disable this option, pcm timer will be unavailable, so + those stubs that use pcm timer (e.g. dmix, dsnoop & co) may work incorrectlly. - For some embedded device, we may disable it to reduce memory + For some embedded devices, we may disable it to reduce memory footprint, about 20KB on x86_64 platform. config SND_SEQUENCER_OSS

2 1

[alsa-devel] [PATCH alsa-plugins] pph: include config.h from rate_speexrate.c
by Tanu Kaskinen 28 Jan '16

28 Jan '16

Fixes compilation against libspeexdsp 1.2rc3. rate_speexrate.c includes speex_resampler.h, which depends on config.h by referencing the HAVE_SPEEX_SPEEXDSP_TYPES_H macro. AFAIK it's not a good idea to include config.h from headers (I don't know/remember why, though), which is why I include config.h from rate_speexrate.c instead of speex_resampler.h. Signed-off-by: Tanu Kaskinen <tanuk(a)iki.fi> --- pph/rate_speexrate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/pph/rate_speexrate.c b/pph/rate_speexrate.c index 0a1325c..8fc4cef 100644 --- a/pph/rate_speexrate.c +++ b/pph/rate_speexrate.c @@ -28,6 +28,7 @@ POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" #include <stdio.h> #include <alsa/asoundlib.h> #include <alsa/pcm_rate.h> -- 2.7.0.rc3

2 1

[alsa-devel] [PATCH 0/2] ARM/sound: fix audio on kirkwood-openrd-client
by Aaro Koskinen 27 Jan '16

27 Jan '16

Hi, Audio playback has been broken some time on OpenRD client. With the following patches I got the audio file playback working with mplayer. Aaro Koskinen (2): ARM: DTS: kirkwood-openrd-client: fix audio ASoC: simple-card: don't fail if sysclk setting is not supported arch/arm/boot/dts/kirkwood-openrd-client.dts | 6 +++++- arch/arm/boot/dts/kirkwood.dtsi | 2 +- sound/soc/generic/simple-card.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) -- 2.4.0

6 12