diff options
| author | Jens Axboe <axboe@kernel.dk> | 2011-10-19 08:30:42 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2011-10-19 08:30:42 -0400 |
| commit | 5c04b426f2e8b46cfc7969a35b2631063a3c646c (patch) | |
| tree | 2d27d9f5d2fe5d5e8fbc01a467ec58bcb50235c1 /sound/usb/quirks.c | |
| parent | 499337bb6511e665a236a6a947f819d98ea340c6 (diff) | |
| parent | 899e3ee404961a90b828ad527573aaaac39f0ab1 (diff) | |
Merge branch 'v3.1-rc10' into for-3.2/core
Conflicts:
block/blk-core.c
include/linux/blkdev.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'sound/usb/quirks.c')
| -rw-r--r-- | sound/usb/quirks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 77762c99afbe..81e07d842581 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c | |||
| @@ -426,7 +426,7 @@ static int snd_usb_cm106_boot_quirk(struct usb_device *dev) | |||
| 426 | */ | 426 | */ |
| 427 | static int snd_usb_cm6206_boot_quirk(struct usb_device *dev) | 427 | static int snd_usb_cm6206_boot_quirk(struct usb_device *dev) |
| 428 | { | 428 | { |
| 429 | int err, reg; | 429 | int err = 0, reg; |
| 430 | int val[] = {0x2004, 0x3000, 0xf800, 0x143f, 0x0000, 0x3000}; | 430 | int val[] = {0x2004, 0x3000, 0xf800, 0x143f, 0x0000, 0x3000}; |
| 431 | 431 | ||
| 432 | for (reg = 0; reg < ARRAY_SIZE(val); reg++) { | 432 | for (reg = 0; reg < ARRAY_SIZE(val); reg++) { |