diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-03-11 14:48:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-03-11 14:48:09 +0100 |
| commit | cc99a0861fa1c72335dc91a2e06d0b431911d55e (patch) | |
| tree | b5bba9600470f8a5e417519b7c2d5fd13d079c3b /sound/usb/caiaq | |
| parent | ALSA: usb-audio - Add "cval->res = 384" quirk for Logitech Webcam C600 (diff) | |
| parent | ALSA: usb-audio: fix oops due to cleanup race when disconnecting (diff) | |
| download | linux-cc99a0861fa1c72335dc91a2e06d0b431911d55e.tar.xz linux-cc99a0861fa1c72335dc91a2e06d0b431911d55e.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/usb/caiaq')
| -rw-r--r-- | sound/usb/caiaq/audio.c | 2 | ||||
| -rw-r--r-- | sound/usb/caiaq/midi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/caiaq/audio.c b/sound/usb/caiaq/audio.c index e411cd323d57..d0d493ca28ae 100644 --- a/sound/usb/caiaq/audio.c +++ b/sound/usb/caiaq/audio.c @@ -785,7 +785,7 @@ int snd_usb_caiaq_audio_init(struct snd_usb_caiaqdev *dev) } dev->pcm->private_data = dev; - strcpy(dev->pcm->name, dev->product_name); + strlcpy(dev->pcm->name, dev->product_name, sizeof(dev->pcm->name)); memset(dev->sub_playback, 0, sizeof(dev->sub_playback)); memset(dev->sub_capture, 0, sizeof(dev->sub_capture)); diff --git a/sound/usb/caiaq/midi.c b/sound/usb/caiaq/midi.c index 2f218c77fff2..a1a47088fd0c 100644 --- a/sound/usb/caiaq/midi.c +++ b/sound/usb/caiaq/midi.c @@ -136,7 +136,7 @@ int snd_usb_caiaq_midi_init(struct snd_usb_caiaqdev *device) if (ret < 0) return ret; - strcpy(rmidi->name, device->product_name); + strlcpy(rmidi->name, device->product_name, sizeof(rmidi->name)); rmidi->info_flags = SNDRV_RAWMIDI_INFO_DUPLEX; rmidi->private_data = device; |