[ALSA] sound: pcxhr_core.c fix shadowed variable warning

Inner loop redeclares err with u32 rather than int, stupid fix here
is to change the inner err to err2.
sound/pci/pcxhr/pcxhr_core.c:1008:8: warning: symbol 'err' shadows an earlier one
sound/pci/pcxhr/pcxhr_core.c:983:6: originally declared here

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 19 insertions, 12 deletions

diff --git a/sound/pci/pcxhr/pcxhr_core.c b/sound/pci/pcxhr/pcxhr_core.c
index c4e415d07380..846afbd30682 100644
--- a/sound/pci/pcxhr/pcxhr_core.c
+++ b/sound/pci/pcxhr/pcxhr_core.c
@@ -1005,30 +1005,37 @@ void pcxhr_msg_tasklet(unsigned long arg)
                         int nb_stream = (prmh->stat[i] >> (2*FIELD_SIZE)) & MASK_FIRST_FIELD;
                         int pipe = prmh->stat[i] & MASK_FIRST_FIELD;
                         int is_capture = prmh->stat[i] & 0x400000;
-                        u32 err;
+                        u32 err2;
 
                         if (prmh->stat[i] & 0x800000) { /* if BIT_END */
                                 snd_printdd("TASKLET : End%sPipe %d\n",
                                             is_capture ? "Record" : "Play", pipe);
                         }
                         i++;
-                        err = prmh->stat[i] ? prmh->stat[i] : prmh->stat[i+1];
-                        if (err)
-                                pcxhr_handle_async_err(mgr, err, PCXHR_ERR_PIPE,
+                        err2 = prmh->stat[i] ? prmh->stat[i] : prmh->stat[i+1];
+                        if (err2)
+                                pcxhr_handle_async_err(mgr, err2,
+                                                       PCXHR_ERR_PIPE,
                                                        pipe, is_capture);
                         i += 2;
                         for (j = 0; j < nb_stream; j++) {
-                                err = prmh->stat[i] ? prmh->stat[i] : prmh->stat[i+1];
-                                if (err)
-                                        pcxhr_handle_async_err(mgr, err, PCXHR_ERR_STREAM,
-                                                               pipe, is_capture);
+                                err2 = prmh->stat[i] ?
+                                        prmh->stat[i] : prmh->stat[i+1];
+                                if (err2)
+                                        pcxhr_handle_async_err(mgr, err2,
+                                                               PCXHR_ERR_STREAM,
+                                                               pipe,
+                                                               is_capture);
                                 i += 2;
                         }
                         for (j = 0; j < nb_audio; j++) {
-                                err = prmh->stat[i] ? prmh->stat[i] : prmh->stat[i+1];
-                                if (err)
-                                        pcxhr_handle_async_err(mgr, err, PCXHR_ERR_AUDIO,
-                                                               pipe, is_capture);
+                                err2 = prmh->stat[i] ?
+                                        prmh->stat[i] : prmh->stat[i+1];
+                                if (err2)
+                                        pcxhr_handle_async_err(mgr, err2,
+                                                               PCXHR_ERR_AUDIO,
+                                                               pipe,
+                                                               is_capture);
                                 i += 2;
                         }
                 }