[alsa-devel] [PATCH] sound: print small buffers via %*ph[C]

Takashi Iwai tiwai at suse.de
Mon Aug 6 11:10:58 CEST 2012


At Thu,  2 Aug 2012 16:52:41 +0300,
Andy Shevchenko wrote:
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>

Applied now.  Thanks.


Takashi

> ---
>  sound/isa/gus/interwave.c  |    5 ++---
>  sound/usb/6fire/firmware.c |    5 ++---
>  2 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/sound/isa/gus/interwave.c b/sound/isa/gus/interwave.c
> index a76bc8d..3fc8b66 100644
> --- a/sound/isa/gus/interwave.c
> +++ b/sound/isa/gus/interwave.c
> @@ -443,9 +443,8 @@ static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus)
>  		for (i = 0; i < 8; ++i)
>  			iwave[i] = snd_gf1_peek(gus, bank_pos + i);
>  #ifdef CONFIG_SND_DEBUG_ROM
> -		printk(KERN_DEBUG "ROM at 0x%06x = %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", bank_pos,
> -		       iwave[0], iwave[1], iwave[2], iwave[3],
> -		       iwave[4], iwave[5], iwave[6], iwave[7]);
> +		printk(KERN_DEBUG "ROM at 0x%06x = %*phC\n", bank_pos,
> +				  8, iwave);
>  #endif
>  		if (strncmp(iwave, "INTRWAVE", 8))
>  			continue;	/* first check */
> diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c
> index 56ad923..a1d9b07 100644
> --- a/sound/usb/6fire/firmware.c
> +++ b/sound/usb/6fire/firmware.c
> @@ -346,11 +346,10 @@ static int usb6fire_fw_check(u8 *version)
>  		if (!memcmp(version, known_fw_versions + i, 4))
>  			return 0;
>  
> -	snd_printk(KERN_ERR PREFIX "invalid fimware version in device: "
> -			"%02x %02x %02x %02x. "
> +	snd_printk(KERN_ERR PREFIX "invalid fimware version in device: %*ph. "
>  			"please reconnect to power. if this failure "
>  			"still happens, check your firmware installation.",
> -			version[0], version[1], version[2], version[3]);
> +			4, version);
>  	return -EINVAL;
>  }
>  
> -- 
> 1.7.10.4
> 


More information about the Alsa-devel mailing list