diff options
Diffstat (limited to 'sound/core/jack.c')
| -rw-r--r-- | sound/core/jack.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sound/core/jack.c b/sound/core/jack.c index 284432f427f4..bd2d9e6b55e9 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -34,7 +34,6 @@ static int snd_jack_dev_free(struct snd_device *device) else input_free_device(jack->input_dev); - kfree(jack->id); kfree(jack); return 0; @@ -88,7 +87,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, if (jack == NULL) return -ENOMEM; - jack->id = kstrdup(id, GFP_KERNEL); + jack->id = id; jack->input_dev = input_allocate_device(); if (jack->input_dev == NULL) { @@ -103,9 +102,6 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, if (type & SND_JACK_HEADPHONE) input_set_capability(jack->input_dev, EV_SW, SW_HEADPHONE_INSERT); - if (type & SND_JACK_LINEOUT) - input_set_capability(jack->input_dev, EV_SW, - SW_LINEOUT_INSERT); if (type & SND_JACK_MICROPHONE) input_set_capability(jack->input_dev, EV_SW, SW_MICROPHONE_INSERT); @@ -157,9 +153,6 @@ void snd_jack_report(struct snd_jack *jack, int status) if (jack->type & SND_JACK_HEADPHONE) input_report_switch(jack->input_dev, SW_HEADPHONE_INSERT, status & SND_JACK_HEADPHONE); - if (jack->type & SND_JACK_LINEOUT) - input_report_switch(jack->input_dev, SW_LINEOUT_INSERT, - status & SND_JACK_LINEOUT); if (jack->type & SND_JACK_MICROPHONE) input_report_switch(jack->input_dev, SW_MICROPHONE_INSERT, status & SND_JACK_MICROPHONE); |