diff options
author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2014-05-27 11:14:44 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-05-27 11:35:48 -0400 |
commit | 791c67b427dfebfd930228ce33a42e70d6d7a7d3 (patch) | |
tree | 06b9e86fabd8f66fafedc8b9c41eb6bd2e28d8b4 /sound/firewire | |
parent | 73616c4eec95419fa6334589e0751498f738d0c4 (diff) |
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/firewire')
-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) | |||
69 | struct fw_device *fw_dev = fw_parent_device(bebob->unit); | 69 | struct fw_device *fw_dev = fw_parent_device(bebob->unit); |
70 | char vendor[24] = {0}; | 70 | char vendor[24] = {0}; |
71 | char model[32] = {0}; | 71 | char model[32] = {0}; |
72 | u32 id; | 72 | u32 hw_id; |
73 | u32 data[2] = {0}; | 73 | u32 data[2] = {0}; |
74 | u32 revision; | 74 | u32 revision; |
75 | int err; | 75 | int err; |
@@ -88,7 +88,7 @@ name_device(struct snd_bebob *bebob, unsigned int vendor_id) | |||
88 | 88 | ||
89 | /* get hardware id */ | 89 | /* get hardware id */ |
90 | err = snd_bebob_read_quad(bebob->unit, INFO_OFFSET_HW_MODEL_ID, | 90 | err = snd_bebob_read_quad(bebob->unit, INFO_OFFSET_HW_MODEL_ID, |
91 | &id); | 91 | &hw_id); |
92 | if (err < 0) | 92 | if (err < 0) |
93 | goto end; | 93 | goto end; |
94 | 94 | ||
@@ -109,7 +109,7 @@ name_device(struct snd_bebob *bebob, unsigned int vendor_id) | |||
109 | strcpy(bebob->card->mixername, model); | 109 | strcpy(bebob->card->mixername, model); |
110 | snprintf(bebob->card->longname, sizeof(bebob->card->longname), | 110 | snprintf(bebob->card->longname, sizeof(bebob->card->longname), |
111 | "%s %s (id:%d, rev:%d), GUID %08x%08x at %s, S%d", | 111 | "%s %s (id:%d, rev:%d), GUID %08x%08x at %s, S%d", |
112 | vendor, model, id, revision, | 112 | vendor, model, hw_id, revision, |
113 | data[0], data[1], dev_name(&bebob->unit->device), | 113 | data[0], data[1], dev_name(&bebob->unit->device), |
114 | 100 << fw_dev->max_speed); | 114 | 100 << fw_dev->max_speed); |
115 | end: | 115 | end: |