diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2014-05-28 00:14:44 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-05-27 17:35:48 +0200 |
| commit | 791c67b427dfebfd930228ce33a42e70d6d7a7d3 (patch) | |
| tree | 06b9e86fabd8f66fafedc8b9c41eb6bd2e28d8b4 /sound | |
| parent | 73616c4eec95419fa6334589e0751498f738d0c4 (diff) | |
| download | blackbird-op-linux-791c67b427dfebfd930228ce33a42e70d6d7a7d3.tar.gz blackbird-op-linux-791c67b427dfebfd930228ce33a42e70d6d7a7d3.zip | |
ALSA: bebob: Use different names for identifiers in the same file
To suppress 'sparse' warning.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/firewire/bebob/bebob.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/firewire/bebob/bebob.c b/sound/firewire/bebob/bebob.c index 31b96b7264cf..b5e8f99c15a5 100644 --- a/sound/firewire/bebob/bebob.c +++ b/sound/firewire/bebob/bebob.c @@ -69,7 +69,7 @@ name_device(struct snd_bebob *bebob, unsigned int vendor_id) struct fw_device *fw_dev = fw_parent_device(bebob->unit); char vendor[24] = {0}; char model[32] = {0}; - u32 id; + u32 hw_id; u32 data[2] = {0}; u32 revision; int err; @@ -88,7 +88,7 @@ name_device(struct snd_bebob *bebob, unsigned int vendor_id) /* get hardware id */ err = snd_bebob_read_quad(bebob->unit, INFO_OFFSET_HW_MODEL_ID, - &id); + &hw_id); if (err < 0) goto end; @@ -109,7 +109,7 @@ name_device(struct snd_bebob *bebob, unsigned int vendor_id) strcpy(bebob->card->mixername, model); snprintf(bebob->card->longname, sizeof(bebob->card->longname), "%s %s (id:%d, rev:%d), GUID %08x%08x at %s, S%d", - vendor, model, id, revision, + vendor, model, hw_id, revision, data[0], data[1], dev_name(&bebob->unit->device), 100 << fw_dev->max_speed); end: |
