commit 3a5e1d1792729f384c10db966feb8bab76c991ed

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

Merge branch 'topic/misc' into for-linus

Takashi Iwai 17 years ago 3a5e1d17 9d7eff60

+1 -1

1 changed file

expand all

unified split

sound

pci

ice1712

ice1724.c

+1 -1

sound/pci/ice1712/ice1724.c

··· 1239 if (ice->force_pdma4 || ice->force_rdma1) 1240 name = "ICE1724 Secondary"; 1241 else 1242 - name = "IEC1724 IEC958"; 1243 err = snd_pcm_new(ice->card, name, device, play, capt, &pcm); 1244 if (err < 0) 1245 return err;

··· 1239 if (ice->force_pdma4 || ice->force_rdma1) 1240 name = "ICE1724 Secondary"; 1241 else 1242 + name = "ICE1724 IEC958"; 1243 err = snd_pcm_new(ice->card, name, device, play, capt, &pcm); 1244 if (err < 0) 1245 return err;