From df5485ecc62f722e60e53fcaafcc0ffd07e81dc2 Mon Sep 17 00:00:00 2001 From: Jonghwan Choi Date: Wed, 2 Nov 2011 20:13:30 +0900 Subject: [PATCH] --- yaml --- r: 274123 b: refs/heads/master c: 8088041ee35604640760321621e3f058ea2c7061 h: refs/heads/master i: 274121: d00357b9b8febd252a9258468393b5a0577b6650 274119: b4829060e688479806ceb1ba5746ebc209f3f5f3 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-samsung/dev-backlight.c | 1 + trunk/drivers/hwmon/coretemp.c | 3 ++- trunk/drivers/hwmon/w83627ehf.c | 9 +++---- trunk/sound/core/control.c | 4 +-- trunk/sound/pci/hda/hda_intel.c | 4 +-- trunk/sound/pci/hda/hda_local.h | 7 ++---- trunk/sound/pci/hda/patch_realtek.c | 6 ----- trunk/sound/usb/misc/ua101.c | 28 ++++++--------------- 9 files changed, 20 insertions(+), 44 deletions(-) diff --git a/[refs] b/[refs] index cf194e6183ec..eb89dd3c8729 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddf8a0d385979065af7be086a4b89b6a645fe340 +refs/heads/master: 8088041ee35604640760321621e3f058ea2c7061 diff --git a/trunk/arch/arm/plat-samsung/dev-backlight.c b/trunk/arch/arm/plat-samsung/dev-backlight.c index 3cedd4c407af..2adbeaed4c04 100644 --- a/trunk/arch/arm/plat-samsung/dev-backlight.c +++ b/trunk/arch/arm/plat-samsung/dev-backlight.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include diff --git a/trunk/drivers/hwmon/coretemp.c b/trunk/drivers/hwmon/coretemp.c index 104b3767516c..ce18c046f728 100644 --- a/trunk/drivers/hwmon/coretemp.c +++ b/trunk/drivers/hwmon/coretemp.c @@ -60,13 +60,14 @@ MODULE_PARM_DESC(tjmax, "TjMax value in degrees Celsius"); #ifdef CONFIG_SMP #define TO_PHYS_ID(cpu) cpu_data(cpu).phys_proc_id #define TO_CORE_ID(cpu) cpu_data(cpu).cpu_core_id +#define TO_ATTR_NO(cpu) (TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO) #define for_each_sibling(i, cpu) for_each_cpu(i, cpu_sibling_mask(cpu)) #else #define TO_PHYS_ID(cpu) (cpu) #define TO_CORE_ID(cpu) (cpu) +#define TO_ATTR_NO(cpu) (cpu) #define for_each_sibling(i, cpu) for (i = 0; false; ) #endif -#define TO_ATTR_NO(cpu) (TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO) /* * Per-Core Temperature Data diff --git a/trunk/drivers/hwmon/w83627ehf.c b/trunk/drivers/hwmon/w83627ehf.c index 93f5fc7d6059..483cb268781e 100644 --- a/trunk/drivers/hwmon/w83627ehf.c +++ b/trunk/drivers/hwmon/w83627ehf.c @@ -1835,15 +1835,12 @@ static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data, diode = 0x70; } for (i = 0; i < 3; i++) { - const char *label = NULL; - - if (data->temp_label) - label = data->temp_label[data->temp_src[i]]; + const char *label = data->temp_label[data->temp_src[i]]; /* Digital source overrides analog type */ - if (label && strncmp(label, "PECI", 4) == 0) + if (strncmp(label, "PECI", 4) == 0) data->temp_type[i] = 6; - else if (label && strncmp(label, "AMD", 3) == 0) + else if (strncmp(label, "AMD", 3) == 0) data->temp_type[i] = 5; else if ((tmp & (0x02 << i))) data->temp_type[i] = (diode & (0x10 << i)) ? 1 : 3; diff --git a/trunk/sound/core/control.c b/trunk/sound/core/control.c index 59edb12dd542..978fe1a8e9f0 100644 --- a/trunk/sound/core/control.c +++ b/trunk/sound/core/control.c @@ -1081,12 +1081,12 @@ static int snd_ctl_elem_init_enum_names(struct user_element *ue) char *names, *p; size_t buf_len, name_len; unsigned int i; - const uintptr_t user_ptrval = ue->info.value.enumerated.names_ptr; if (ue->info.value.enumerated.names_length > 64 * 1024) return -EINVAL; - names = memdup_user((const void __user *)user_ptrval, + names = memdup_user( + (const void __user *)ue->info.value.enumerated.names_ptr, ue->info.value.enumerated.names_length); if (IS_ERR(names)) return PTR_ERR(names); diff --git a/trunk/sound/pci/hda/hda_intel.c b/trunk/sound/pci/hda/hda_intel.c index 096507d2ca9a..bd7fc99af187 100644 --- a/trunk/sound/pci/hda/hda_intel.c +++ b/trunk/sound/pci/hda/hda_intel.c @@ -3063,12 +3063,12 @@ static DEFINE_PCI_DEVICE_TABLE(azx_ids) = { .class = PCI_CLASS_MULTIMEDIA_HD_AUDIO << 8, .class_mask = 0xffffff, .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND | - AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_POSFIX_LPIB }, + AZX_DCAPS_RIRB_PRE_DELAY }, #else /* this entry seems still valid -- i.e. without emu20kx chip */ { PCI_DEVICE(0x1102, 0x0009), .driver_data = AZX_DRIVER_CTX | AZX_DCAPS_CTX_WORKAROUND | - AZX_DCAPS_RIRB_PRE_DELAY | AZX_DCAPS_POSFIX_LPIB }, + AZX_DCAPS_RIRB_PRE_DELAY }, #endif /* Vortex86MX */ { PCI_DEVICE(0x17f3, 0x3010), .driver_data = AZX_DRIVER_GENERIC }, diff --git a/trunk/sound/pci/hda/hda_local.h b/trunk/sound/pci/hda/hda_local.h index dcbea0da0fa2..79f49e2e8cbc 100644 --- a/trunk/sound/pci/hda/hda_local.h +++ b/trunk/sound/pci/hda/hda_local.h @@ -511,11 +511,8 @@ int snd_hda_jack_detect(struct hda_codec *codec, hda_nid_t nid); static inline bool is_jack_detectable(struct hda_codec *codec, hda_nid_t nid) { return (snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_PRES_DETECT) && - /* disable MISC_NO_PRESENCE check because it may break too - * many devices - */ - /*(get_defcfg_misc(snd_hda_codec_get_pincfg(codec, nid) & - AC_DEFCFG_MISC_NO_PRESENCE)) &&*/ + !(get_defcfg_misc(snd_hda_codec_get_pincfg(codec, nid) & + AC_DEFCFG_MISC_NO_PRESENCE)) && (get_wcaps(codec, nid) & AC_WCAP_UNSOL_CAP); } diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c index 9693059dec84..80d6add8a620 100644 --- a/trunk/sound/pci/hda/patch_realtek.c +++ b/trunk/sound/pci/hda/patch_realtek.c @@ -3329,12 +3329,6 @@ static void alc_auto_set_output_and_unmute(struct hda_codec *codec, if (nid) snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO); - - /* unmute DAC if it's not assigned to a mixer */ - nid = alc_look_for_out_mute_nid(codec, pin, dac); - if (nid == mix && nid_has_mute(codec, dac, HDA_OUTPUT)) - snd_hda_codec_write(codec, dac, 0, AC_VERB_SET_AMP_GAIN_MUTE, - AMP_OUT_ZERO); } static void alc_auto_init_multi_out(struct hda_codec *codec) diff --git a/trunk/sound/usb/misc/ua101.c b/trunk/sound/usb/misc/ua101.c index c0609c210303..67bec7612442 100644 --- a/trunk/sound/usb/misc/ua101.c +++ b/trunk/sound/usb/misc/ua101.c @@ -459,8 +459,7 @@ static void kill_stream_urbs(struct ua101_stream *stream) unsigned int i; for (i = 0; i < stream->queue_length; ++i) - if (stream->urbs[i]) - usb_kill_urb(&stream->urbs[i]->urb); + usb_kill_urb(&stream->urbs[i]->urb); } static int enable_iso_interface(struct ua101 *ua, unsigned int intf_index) @@ -485,9 +484,6 @@ static void disable_iso_interface(struct ua101 *ua, unsigned int intf_index) { struct usb_host_interface *alts; - if (!ua->intf[intf_index]) - return; - alts = ua->intf[intf_index]->cur_altsetting; if (alts->desc.bAlternateSetting != 0) { int err = usb_set_interface(ua->dev, @@ -1148,37 +1144,27 @@ static void free_stream_urbs(struct ua101_stream *stream) { unsigned int i; - for (i = 0; i < stream->queue_length; ++i) { + for (i = 0; i < stream->queue_length; ++i) kfree(stream->urbs[i]); - stream->urbs[i] = NULL; - } } static void free_usb_related_resources(struct ua101 *ua, struct usb_interface *interface) { unsigned int i; - struct usb_interface *intf; - mutex_lock(&ua->mutex); free_stream_urbs(&ua->capture); free_stream_urbs(&ua->playback); - mutex_unlock(&ua->mutex); free_stream_buffers(ua, &ua->capture); free_stream_buffers(ua, &ua->playback); - for (i = 0; i < ARRAY_SIZE(ua->intf); ++i) { - mutex_lock(&ua->mutex); - intf = ua->intf[i]; - ua->intf[i] = NULL; - mutex_unlock(&ua->mutex); - if (intf) { - usb_set_intfdata(intf, NULL); - if (intf != interface) + for (i = 0; i < ARRAY_SIZE(ua->intf); ++i) + if (ua->intf[i]) { + usb_set_intfdata(ua->intf[i], NULL); + if (ua->intf[i] != interface) usb_driver_release_interface(&ua101_driver, - intf); + ua->intf[i]); } - } } static void ua101_card_free(struct snd_card *card)