The patch titled usb-qti-directemp-usb-thermometer-hygrometer-driver-support-fix has been added to the -mm tree. Its filename is usb-qti-directemp-usb-thermometer-hygrometer-driver-support-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: usb-qti-directemp-usb-thermometer-hygrometer-driver-support-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> - `pid' is a well-understood term for a process ID. Rename it. - clean up some memsets - Change the `raw' file's permissions to S_IWUSR. We shouldn't permit unprivileged users to cause a printk spew into the logs. Cc: "Chris Verges" <chrisv@xxxxxxxxxxxxxxxxxx> Cc: Chris Verges <chrisv@xxxxxxxxxxxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/usb/misc/directemp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff -puN drivers/usb/misc/directemp.c~usb-qti-directemp-usb-thermometer-hygrometer-driver-support-fix drivers/usb/misc/directemp.c --- a/drivers/usb/misc/directemp.c~usb-qti-directemp-usb-thermometer-hygrometer-driver-support-fix +++ a/drivers/usb/misc/directemp.c @@ -40,7 +40,7 @@ struct usb_directemp { struct usb_device *udev; struct usb_interface *interface; - uint16_t pid; + uint16_t product_id; uint8_t read_temp; }; @@ -114,7 +114,7 @@ static ssize_t show_temp(struct device * /* Read twice due to a buffer issue on the DirecTEMP */ for (i = 0; i < DIRECTEMP_MAX_RETRIES; i++) { - memset(data, 0, (DIRECTEMP_MSG_SIZE + 1) * sizeof(char)); + memset(data, 0, sizeof(data)); data[0] = directemp->read_temp; err = show_helper(dev, attr, data, data, DIRECTEMP_MSG_SIZE); if (err < 0) @@ -156,7 +156,7 @@ static ssize_t show_rh(struct device *de /* Read twice due to a buffer issue on the DirecTEMP */ for (i = 0; i < DIRECTEMP_MAX_RETRIES; i++) { - memset(data, 0, (DIRECTEMP_MSG_SIZE + 1) * sizeof(char)); + memset(data, 0, sizeof(data)); data[0] = DIRECTEMP_HUMIDITY; err = show_helper(dev, attr, data, data, DIRECTEMP_MSG_SIZE); if (err < 0) @@ -199,7 +199,7 @@ static ssize_t set_raw(struct device *de if (count > DIRECTEMP_MSG_SIZE) count = DIRECTEMP_MSG_SIZE; - memset(data, 0, (DIRECTEMP_MSG_SIZE + 1) * sizeof(char)); + memset(data, 0, sizeof(data)); memcpy(data, buf, count); printk("Request:\n"); @@ -219,7 +219,7 @@ static ssize_t set_raw(struct device *de return 0; } -static DEVICE_ATTR(raw, S_IWUGO, NULL, set_raw); +static DEVICE_ATTR(raw, S_IWUSR, NULL, set_raw); static int directemp_probe(struct usb_interface *interface, const struct usb_device_id *id) @@ -234,10 +234,10 @@ static int directemp_probe(struct usb_in dev->udev = usb_get_dev(udev); usb_set_intfdata(interface, dev); - dev->pid = id->idProduct; + dev->product_id = id->idProduct; dev_dbg(&interface->dev, "Product: %s (ID 0x%04X)\n", - udev->product, dev->pid); + udev->product, dev->product_id); dev_dbg(&interface->dev, "Manufacturer: %s\n", udev->manufacturer); dev_dbg(&interface->dev, "Serial Number: %s\n", @@ -253,7 +253,7 @@ static int directemp_probe(struct usb_in if (err) goto exit_free_sysfs; - switch (dev->pid) { + switch (dev->product_id) { case 0x0002: dev->read_temp = '2'; break; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch linux-next.patch linux-next-git-rejects.patch next-remove-localversion.patch i-need-old-gcc.patch revert-input-wistron_btns-switch-to-using-sparse-keymap-library.patch drivers-media-video-cx23885-needs-kfifo-conversion.patch bitops-rename-for_each_bit-to-for_each_set_bit.patch bitops-rename-for_each_bit-to-for_each_set_bit-fix.patch bitops-rename-for_each_bit-to-for_each_set_bit-fix-fix-2.patch pci-update-pci_set_vga_state-to-call-arch-functions.patch arch-arm-include-asm-elfh-forward-declare-the-task-struct.patch cpufreq-ondemand-dont-synchronize-sample-rate-unless-mulitple-cpus-present.patch fs-fscache-object-listc-fix-warning-on-32-bit.patch timer-stats-fix-del_timer_sync-and-try_to_del_timer_sync.patch jffs2-avoid-using-c-keyword-new-in-userspace-visible-header.patch 3x59x-fix-pci-resource-management.patch ibmphp-read-the-length-of-ebda-and-map-entire-ebda-region-fix.patch kernel-schedc-suppress-unused-var-warning.patch usb-qti-directemp-usb-thermometer-hygrometer-driver-support-fix.patch mm-avoid-false-sharing-of-mm_counter-checkpatch-fixes.patch mm-count-swap-usage-checkpatch-fixes.patch vmscan-check-high-watermark-after-shrink-zone-fix.patch mm-remove-function-free_hot_page-fix.patch mm-restore-zone-all_unreclaimable-to-independence-word-fix.patch memory-hotplug-create-sys-firmware-memmap-entry-for-new-memory-fix.patch include-linux-fsh-convert-fmode_-constants-to-hex.patch mm-change-anon_vma-linking-to-fix-multi-process-server-scalability-issue-fix.patch mm-pm-force-gfp_noio-during-suspend-hibernation-and-resume.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch uml-linec-avoid-null-pointer-dereference-simplify.patch add-generic-sys_ipc-wrapper-fix.patch lib-more-scalable-list_sort-fix.patch hwmon-driver-for-ti-tmp102-temperature-sensor-checkpatch-fixes.patch hwmon-driver-for-ti-tmp102-temperature-sensor-fix.patch mm-pass-mm-flags-as-a-coredump-parameter-for-consistency-fix.patch gpio-pca953xc-add-interrupt-handling-capability-fix.patch broadsheetfb-support-storing-waveform-fix.patch memcg-move-charges-of-anonymous-page-cleanup.patch memcg-implement-memory-thresholds-checkpatch-fixes.patch sysctl-clean-up-vm-related-variable-declarations-fix.patch kmod-add-init-function-to-usermodehelper-fix.patch delay-accounting-re-implement-c-for-getdelaysc-to-report-information-on-a-target-command-checkpatch-fixes.patch reiser4-export-remove_from_page_cache-fix.patch reiser4.patch reiser4-writeback_inodes-implementation-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch notify_change-callers-must-hold-i_mutex.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html