aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-12-02Staging: hv: remove OnChildDeviceDestroy vmbus_driver callbackGreg Kroah-Hartman2-11/+0
No one ever calls it so get rid of it, it's pointless. Cc: Haiyang Zhang <[email protected]> Cc: Hank Janssen <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-02Staging: hv: remove OnChildDeviceCreate vmbus_driver callbackGreg Kroah-Hartman5-25/+5
It's only ever set to one function, so just call that function instead. Cc: Haiyang Zhang <[email protected]> Cc: Hank Janssen <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-02Merge branch 'fix/hda' into for-linusTakashi Iwai3-9/+13
2010-12-02Merge branch 'for-linus' of ↵Linus Torvalds3-16/+24
git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: regulator: fix kernel-doc for set_consumer_device_supply regulator: enable supply regulator only when use count is zero regulator: twl-regulator - fix twlreg_set_mode regulator: lock supply in regulator enable regulator: Return proper error for regulator_register() regulator: Ensure enough delay time for enabling regulator regulator: Remove a redundant device_remove_file call in create_regulator regulator: Staticise mc13783_powermisc_rmw() regulator: regulator disable supply fix
2010-12-02Merge branch 'v4l_for_linus' of ↵Linus Torvalds31-111/+90
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: [media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions [media] v4l: Remove hardcoded module names passed to v4l2_i2c_new_subdev* (2)
2010-12-02Merge branch 'rbd-sysfs' of ↵Linus Torvalds2-277/+554
git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'rbd-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: rbd: replace the rbd sysfs interface
2010-12-02Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds11-80/+127
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: fix parsing of hostname in dfs referrals cifs: display fsc in /proc/mounts cifs: enable fscache iff fsc mount option is used explicitly cifs: allow fsc mount option only if CONFIG_CIFS_FSCACHE is set cifs: Handle extended attribute name cifs_acl to generate cifs acl blob (try #4) cifs: Misc. cleanup in cifsacl handling [try #4] cifs: trivial comment fix for cifs_invalidate_mapping [CIFS] fs/cifs/Kconfig: CIFS depends on CRYPTO_HMAC cifs: don't take extra tlink reference in initiate_cifs_search cifs: Percolate error up to the caller during get/set acls [try #4] cifs: fix another memleak, in cifs_root_iget cifs: fix potential use-after-free in cifs_oplock_break_put
2010-12-02xen: unplug the emulated devices at resume timeStefano Stabellini3-2/+3
Early after being resumed we need to unplug again the emulated devices. Signed-off-by: Stefano Stabellini <[email protected]>
2010-12-02xen: fix save/restore for PV on HVM guests with pirq remappingStefano Stabellini1-0/+38
Re-map and re-bind all the pirqs at resume time. Signed-off-by: Stefano Stabellini <[email protected]>
2010-12-02xen: resume the pv console for hvm guests tooStefano Stabellini1-0/+1
Signed-off-by: Stefano Stabellini <[email protected]>
2010-12-02xen: fix MSI setup and teardown for PV on HVM guestsStefano Stabellini3-15/+43
When remapping MSIs into pirqs for PV on HVM guests, qemu is responsible for doing the actual mapping and unmapping. We only give qemu the desired pirq number when we ask to do the mapping the first time, after that we should be reading back the pirq number from qemu every time we want to re-enable the MSI. This fixes a bug in xen_hvm_setup_msi_irqs that manifests itself when trying to enable the same MSI for the second time: the old MSI to pirq mapping is still valid at this point but xen_hvm_setup_msi_irqs would try to assign a new pirq anyway. A simple way to reproduce this bug is to assign an MSI capable network card to a PV on HVM guest, if the user brings down the corresponding ethernet interface and up again, Linux would fail to enable MSIs on the device. Signed-off-by: Stefano Stabellini <[email protected]>
2010-12-02xen: use PHYSDEVOP_get_free_pirq to implement find_unbound_pirqStefano Stabellini2-25/+30
Use the new hypercall PHYSDEVOP_get_free_pirq to ask Xen to allocate a pirq. Remove the unsupported PHYSDEVOP_get_nr_pirqs hypercall to get the amount of pirq available. This fixes find_unbound_pirq that otherwise would return a number starting from nr_irqs that might very well be out of range in Xen. The symptom of this bug is that when you passthrough an MSI capable pci device to a PV on HVM guest, Linux would fail to enable MSIs on the device. Signed-off-by: Stefano Stabellini <[email protected]>
2010-12-02watchdog: it8712f_wdt: add note to KconfigWim Van Sebroeck1-0/+3
On some motherboards the it8712f watchdog does not work unless the game port was enabled. see Bug 13140. We therefor add a note to Kconfig. Signed-off-by: Wim Van Sebroeck <[email protected]>
2010-12-02watchdog: gef_wdt: include fs.hWolfram Sang & Martyn Welch1-0/+1
Add missing include "linux/fs.h". This fixes compile failure. Signed-off-by: Wolfram Sang <[email protected]> Signed-off-by: Martyn Welch <[email protected]> Signed-off-by: Wim Van Sebroeck <[email protected]>
2010-12-02watchdog: bcm63xx_wdt: improve platform part.Wim Van Sebroeck1-30/+12
* fix devinit and devexit sections * fix platform removal code so that the iounmap happens after the removal of the timer. * changes the reboot_notifier by a platform shutdown method. Signed-off-by: Wim Van Sebroeck <[email protected]>
2010-12-02watchdog: iTCO_wdt: TCO Watchdog patch for Intel Patsburg PCHSeth Heasley1-2/+6
This patch adds an additional LPC Controller DeviceID for the Intel Patsburg PCH for TCO Watchdog. Signed-off-by: Seth Heasley <[email protected]> Signed-off-by: Wim Van Sebroeck <[email protected]>
2010-12-02ASoC: omap: N810: Don't select CONFIG_OMAP_MUX but make it as dependencyJarkko Nikula1-1/+1
Not all omap boards use kernel based pin multiplexing so CONFIG_SND_OMAP_SOC_N810 should not select it by default as it can make harm to other boards in multi-board kernels. Therefore put CONFIG_OMAP_MUX as a dependency to N810 ASoC machine driver. Thanks to Tony Lindgren <[email protected]> for noticing. Signed-off-by: Jarkko Nikula <[email protected]> Cc: Tony Lindgren <[email protected]> Acked-by: Mark Brown <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2010-12-02HID: length resolution should be reported units/mmDmitry Torokhov1-8/+11
Input ABI requires reporting resolution on main axes in units per millimeter, not units per inch, so we need to convert accordingly. Tested-by: Nikolai Kondrashov <[email protected]> Acked-by: Nikolai Kondrashov <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2010-12-02ALSA: hda: Use "alienware" model quirk for another SSIDDaniel T Chen1-0/+2
BugLink: https://launchpad.net/bugs/683695 The original reporter states that headphone jacks do not appear to work. Upon inspecting his codec dump, and upon further testing, it is confirmed that the "alienware" model quirk is correct. Reported-and-tested-by: Cody Thierauf Cc: <[email protected]> [2.6.32+] Signed-off-by: Daniel T Chen <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-12-01Merge branches 'misc', 'mlx4' and 'nes' into for-nextRoland Dreier4-9/+12
2010-12-01IB: Fix information leak in marshalling codeVasiliy Kulikov1-0/+4
ib_ucm_init_qp_attr() and ucma_init_qp_attr() pass struct ib_uverbs_qp_attr with reserved, qp_state, {ah_attr,alt_ah_attr}{reserved,->grh.reserved} fields uninitialized to copy_to_user(). This leads to leaking of contents of kernel stack memory to userspace. Signed-off-by: Vasiliy Kulikov <[email protected]> Signed-off-by: Roland Dreier <[email protected]>
2010-12-01IB/pack: Remove some unused code added by the IBoE patchesOr Gerlitz1-30/+0
Remove unused functions added by commit ff7f5aab354d ("IB/pack: IBoE UD packet packing support"). Signed-off-by: Or Gerlitz <[email protected]>
2010-12-01IB/mlx4: Fix IBoE link stateEli Cohen1-1/+1
Use netif_running() and netif_carrier_ok() to report link state, exactly as is done to report Ethernet link state in sysfs. Signed-off-by: Eli Cohen <[email protected]> Signed-off-by: Roland Dreier <[email protected]>
2010-12-01IB/mlx4: Fix IBoE reported link rateEli Cohen1-1/+1
The link rate is the product of the link speed in the link width. For Etherent ports the rate is 10G, so we use 1 for the width and 4 for speed to get the correct rate. Signed-off-by: Eli Cohen <[email protected]> Signed-off-by: Roland Dreier <[email protected]>
2010-12-01mlx4_core: Workaround firmware bug in query dev capEli Cohen1-0/+4
ConnectX firmware is supposed to report the number blue flame registers per page as log2 of the value. However, due to a firmware bug, it reports actual number. This patch works around this by checking if the number of registers calculated fits within a page. If it does not, we use 8 registers per page. Signed-off-by: Eli Cohen <[email protected]> Signed-off-by: Roland Dreier <[email protected]>
2010-12-01rbd: replace the rbd sysfs interfaceYehuda Sadeh2-277/+554
The new interface creates directories per mapped image and under each it creates a subdir per available snapshot. This allows keeping a cleaner interface within the sysfs guidelines. The ABI documentation was updated too. Acked-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Yehuda Sadeh <[email protected]> Signed-off-by: Sage Weil <[email protected]>
2010-12-01staging: brcm80211: replaced typedef struct wl_info_t by struct wl_info.Roland Vossen6-73/+69
Part of the code cleanup effort. CodingStyle doc advises to restrict the usage of typedefs. Also moved several function declarations from .c to .h file because this typedef replace operation induced checkpatch.pl warnings. Signed-off-by: Roland Vossen <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01staging: brcm80211 needs lots of delay.hRandy Dunlap8-0/+8
Fix lots of errors like: drivers/staging/brcm80211/phy/wlc_phy_n.c:17613: error: implicit declaration of function 'mdelay' drivers/staging/brcm80211/util/nicpci.c:246: error: implicit declaration of function 'udelay' Signed-off-by: Randy Dunlap <[email protected]> Cc: Brett Rudley <[email protected]> Cc: Henry Ptasinski <[email protected]> Cc: Dowan Kim <[email protected]> Cc: Roland Vossen <[email protected]> Cc: Arend van Spriel <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01staging: brcm80211: bcmp => memcmpBrett Rudley8-12/+10
s/bcmp/memcmp/ Signed-off-by: Brett Rudley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01staging: brcm80211: bzero => memsetBrett Rudley19-80/+82
s/bzero/memset/g Signed-off-by: Brett Rudley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01staging: brcm80211: remove OSL_SYSUPTIME_SUPPORTBrett Rudley1-7/+0
Signed-off-by: Brett Rudley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01staging: brcm80211: Remove bogus gcc version checkingBrett Rudley1-10/+1
Signed-off-by: Brett Rudley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01staging: brcm80211: Remove unused PKTFREESETCBBrett Rudley3-15/+0
Signed-off-by: Brett Rudley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01staging: brcm80211: Remove OSL_DMADDRWIDTHBrett Rudley2-4/+0
Signed-off-by: Brett Rudley <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: rtl8192u: check return code kmalloc.David Chosrova1-0/+2
This patch checks the return code of kmalloc when trying to allocate memory for priv->rx_urb in rtl8192_usb_initendpoints(), return -ENOMEM when failed. Signed-off-by: David Chosrova <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01staging: iio: dds: ad9832: Fix kconfig descriptionMichael Hennerich1-2/+2
The AD9832 driver doesn't support the AD9833 and AD9834 Signed-off-by: Michael Hennerich <[email protected]> Acked-by: Jonathan Cameron <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: rtl8192u: remove dead code to disable dot11dDavid Chosrova12-109/+0
This patch removes all the ENABLE_DOT11D ifdefs. It is always defined for driver. DOT11D has to do with regulatory domains. What prompted this patch was a warning message in Sparse. drivers/staging/rtl8192u/r8192U_core.c:247:1: warning: "eqMacAddr" redefined in file included from drivers/staging/rtl8192u/:81:81: drivers/staging/rtl8192u/dot11d.h:35:1: warning: this is the location of the previous definition Now there are no ifdefs around dot11d.h it made no sense to have this second definition, so I removed that macro as well. ( Thanks Dan ;-) ). Acked-by. Dan Carpenter <[email protected]> Signed-off-by: David Chosrova <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: w35und: Kill struct wb_usbPekka Enberg6-32/+13
This patch kills struct wb_usb which now only contains a pointer to struct usb_device. Cc: Pavel Machek <[email protected]> Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: w35und: Remove unused fields from struct wb_usbPekka Enberg3-9/+2
This patch removes two unused fields from struct wb_usb: - DetectCount which is always zero - IsUsb20 which is a write-only struct member Cc: Pavel Machek <[email protected]> Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: w35und: Kill wblinux_f.h headerPekka Enberg3-19/+0
The wblinux_f.h header file doesn't contain anything that's actually used. Kill it. Cc: Pavel Machek <[email protected]> Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: w35und: Merge mlmetxrx.c to mds.cPekka Enberg5-82/+38
This patch merges mlmetxrx.c to mds.c because it's small and the functions are only used in mto.c. Cc: Pavel Machek <[email protected]> Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: w35und: Kill _IBSS_BEACON_SEQ_STICK_Pekka Enberg2-8/+0
This patch kills the _IBSS_BEACON_SEQ_STICK_ ifdefs because the macro is never defined. Cc: Pavel Machek <[email protected]> Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: w35und: Kill write-only ->TxTogglePekka Enberg2-9/+0
This patch removes ->TxToggle from struct wb35_mds because it's a write only struct member. Cc: Pavel Machek <[email protected]> Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: w35und: Kill Vendor2 ifdef from hal_init_hardwarePekka Enberg1-7/+0
The Vendor2 macro is never defined so remove the ifdef'd block from hal_init_hardware(). Cc: Pavel Machek <[email protected]> Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: w35und: Remove empty sysdef.h headerPekka Enberg9-15/+0
The sysdef.h header is empty now so kill it. Cc: Pavel Machek <[email protected]> Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: w35und: Use pr_debug() for debuggingPekka Enberg7-99/+26
Use pr_debug() for debugging printk's and kill the FULL_DEBUG macro. It would be even better to use dev_dbg() but unfortunately looking up struct device in the current code structure makes things very ugly. Please note that I dropped the DataDmp() calls from RFSynthesizer_SwitchingChannel() because that function doesn't exist. Cc: Pavel Machek <[email protected]> Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: w35und: Kill unused code in mac_structures.hPekka Enberg1-499/+0
This patch kills tons of unused macros and struct definitions from mac_structures.h. Cc: Pavel Machek <[email protected]> Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: w35und: Kill WPA2 definitionsPekka Enberg2-48/+0
The _WPA2_ macro is always defined but the data structures that are wrapped by it are never used. Kill them. Cc: Pavel Machek <[email protected]> Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: w35und: Kill _USE_FALLBACK_RATE_ macroPekka Enberg2-6/+0
The _USE_FALLBACK_RATE_ macro parametrizes DEFAULT_RATE_RETRY_LIMIT. It's only used in Mxx_initial() in reg.c where _USE_FALLBACK_RATE_ is always defined because the reg.c file includes sysdef.h at the top. It's therefore safe to remove the _USE_FALLBACK_RATE_ macro. Cc: Pavel Machek <[email protected]> Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2010-12-01Staging: w35und: Remove unused defines from sysdef.hPekka Enberg1-6/+0
This patch removes all the defines in sysdef.h that are not used at all. Cc: Pavel Machek <[email protected]> Signed-off-by: Pekka Enberg <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>