← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to debian/patches/features/all/hda-via/0009-ALSA-HDA-VIA-Remove-unused-argument-of-via_new_analo.patch

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/features/all/hda-via/0009-ALSA-HDA-VIA-Remove-unused-argument-of-via_new_analo.patch
1
 
From 4db16029262bb0cfe2bc8e3c8253a6e7958f5368 Mon Sep 17 00:00:00 2001
2
 
From: Lydia Wang <lydiawang@viatech.com.cn>
3
 
Date: Sat, 10 Oct 2009 19:07:39 +0800
4
 
Subject: [PATCH 09/19] ALSA: HDA VIA: Remove unused argument of via_new_analog_input
5
 
 
6
 
commit 9510e8dd9cb4469d146953270364af6dd86a39be upstream.
7
 
 
8
 
Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
9
 
Signed-off-by: Logan Li <loganli@viatech.com.cn>
10
 
Signed-off-by: Takashi Iwai <tiwai@suse.de>
11
 
---
12
 
 sound/pci/hda/patch_via.c |   19 +++++++------------
13
 
 1 files changed, 7 insertions(+), 12 deletions(-)
14
 
 
15
 
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
16
 
index bf28a49..128f6bc 100644
17
 
--- a/sound/pci/hda/patch_via.c
18
 
+++ b/sound/pci/hda/patch_via.c
19
 
@@ -327,8 +327,8 @@ static void via_free_kctls(struct hda_codec *codec)
20
 
 }
21
 
 
22
 
 /* create input playback/capture controls for the given pin */
23
 
-static int via_new_analog_input(struct via_spec *spec, hda_nid_t pin,
24
 
-                               const char *ctlname, int idx, int mix_nid)
25
 
+static int via_new_analog_input(struct via_spec *spec, const char *ctlname,
26
 
+                               int idx, int mix_nid)
27
 
 {
28
 
        char name[32];
29
 
        int err;
30
 
@@ -1684,8 +1684,7 @@ static int vt1708_auto_create_analog_input_ctls(struct via_spec *spec,
31
 
                        idx = 1;
32
 
                        break;
33
 
                }
34
 
-               err = via_new_analog_input(spec, cfg->input_pins[i], labels[i],
35
 
-                                          idx, 0x17);
36
 
+               err = via_new_analog_input(spec, labels[i], idx, 0x17);
37
 
                if (err < 0)
38
 
                        return err;
39
 
                imux->items[imux->num_items].label = labels[i];
40
 
@@ -2220,8 +2219,7 @@ static int vt1709_auto_create_analog_input_ctls(struct via_spec *spec,
41
 
                        idx = 1;
42
 
                        break;
43
 
                }
44
 
-               err = via_new_analog_input(spec, cfg->input_pins[i], labels[i],
45
 
-                                          idx, 0x18);
46
 
+               err = via_new_analog_input(spec, labels[i], idx, 0x18);
47
 
                if (err < 0)
48
 
                        return err;
49
 
                imux->items[imux->num_items].label = labels[i];
50
 
@@ -2784,8 +2782,7 @@ static int vt1708B_auto_create_analog_input_ctls(struct via_spec *spec,
51
 
                        idx = 1;
52
 
                        break;
53
 
                }
54
 
-               err = via_new_analog_input(spec, cfg->input_pins[i], labels[i],
55
 
-                                          idx, 0x16);
56
 
+               err = via_new_analog_input(spec, labels[i], idx, 0x16);
57
 
                if (err < 0)
58
 
                        return err;
59
 
                imux->items[imux->num_items].label = labels[i];
60
 
@@ -3258,8 +3255,7 @@ static int vt1708S_auto_create_analog_input_ctls(struct via_spec *spec,
61
 
                        idx = 1;
62
 
                        break;
63
 
                }
64
 
-               err = via_new_analog_input(spec, cfg->input_pins[i], labels[i],
65
 
-                                          idx, 0x16);
66
 
+               err = via_new_analog_input(spec, labels[i], idx, 0x16);
67
 
                if (err < 0)
68
 
                        return err;
69
 
                imux->items[imux->num_items].label = labels[i];
70
 
@@ -3624,8 +3620,7 @@ static int vt1702_auto_create_analog_input_ctls(struct via_spec *spec,
71
 
                        idx = 3;
72
 
                        break;
73
 
                }
74
 
-               err = via_new_analog_input(spec, cfg->input_pins[i],
75
 
-                                          labels[i], idx, 0x1A);
76
 
+               err = via_new_analog_input(spec, labels[i], idx, 0x1A);
77
 
                if (err < 0)
78
 
                        return err;
79
 
                imux->items[imux->num_items].label = labels[i];
80
 
1.7.1
81