diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-07-25 12:30:27 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-07-25 12:30:49 +0200 |
| commit | a3f8612700507a10ad7186fd77e9f46c7af88335 (patch) | |
| tree | f00be0b726748113ffeb4e1caf7ade7ef33cfabe /sound/pci/es1938.c | |
| parent | 8ecada16512c90ae782b00f15ebff0c32e4cd92a (diff) | |
| parent | 07bc9dc1b01bad7084fed3d2659e5d83317869bc (diff) | |
Merge branch 'master' into for-next
Sync with Linus' master to be able to apply
trivial patche to newer code.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'sound/pci/es1938.c')
| -rw-r--r-- | sound/pci/es1938.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c index 8423403954ab..9213fb38921c 100644 --- a/sound/pci/es1938.c +++ b/sound/pci/es1938.c @@ -1881,7 +1881,6 @@ static int snd_es1938_probe(struct pci_dev *pci, static void snd_es1938_remove(struct pci_dev *pci) { snd_card_free(pci_get_drvdata(pci)); - pci_set_drvdata(pci, NULL); } static struct pci_driver es1938_driver = { |