summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-11-15net-next:asix:poll in asix_get_phyid in case phy not readyGrant Grundler
Sometimes the phy isn't ready after reset...poll and pray it will be soon. Signed-off-by: Freddy Xin <freddy@asix.com.tw> Signed-off-by: Grant Grundler <grundler@chromium.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2011-11-15net-next:asix:PHY_MODE_RTL8211CL should be 0xCGrant Grundler
Use correct value for rtl phy support. (rtl phy are in AX88178 devices like NWU220G and USB2-ET1000). Signed-off-by: Allan Chou <allan@asix.com.tw> Tested-by: Grant Grundler <grundler@chromium.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2011-11-15sparc: Stash orig_i0 into %g6 instead of %g2David S. Miller
As per the comments added by this commit, %g2 turns out to not be a usable place to save away orig_i0 for syscall restart handling. In fact all of %g2, %g3, %g4, and %g5 are assumed to be saved across a system call by various bits of code in glibc. %g1 can't be used because that holds the syscall number, which would need to be saved and restored for syscall restart handling too, and that would only compound our problems :-) This leaves us with %g6 and %g7 which are for "system use". %g7 is used as the "thread register" by glibc, but %g6 is used as a compiler and assembler temporary scratch register. And in no instance is %g6 used to hold a value across a system call. Therefore %g6 is safe for storing away orig_i0, at least for now. Signed-off-by: David S. Miller <davem@davemloft.net>
2011-11-15PM / driver core: disable device's runtime PM during shutdownPeter Chen
There may be an issue when the user issue "reboot/shutdown" command, then the device has shut down its hardware, after that, this runtime-pm featured device's driver will probably be scheduled to do its suspend routine, and at its suspend routine, it may access hardware, but the device has already shutdown physically, then the system hang may be occurred. I ran out this issue using an auto-suspend supported USB devices, like 3G modem, keyboard. The usb runtime suspend routine may be scheduled after the usb controller has been shut down, and the usb runtime suspend routine will try to suspend its roothub(controller), it will access register, then the system hang occurs as the controller is shutdown. Signed-off-by: Peter Chen <peter.chen@freescale.com> Acked-by: Ming Lei <tom.leiming@gmail.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Cc: stable@kernel.org Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
2011-11-15xfs: use doalloc flag in xfs_qm_dqattach_one()Mitsuo Hayasaka
The doalloc arg in xfs_qm_dqattach_one() is a flag that indicates whether a new area to handle quota information will be allocated if needed. Originally, it was passed to xfs_qm_dqget(), but has been removed by the following commit (probably by mistake): commit 8e9b6e7fa4544ea8a0e030c8987b918509c8ff47 Author: Christoph Hellwig <hch@lst.de> Date: Sun Feb 8 21:51:42 2009 +0100 xfs: remove the unused XFS_QMOPT_DQLOCK flag As the result, xfs_qm_dqget() called from xfs_qm_dqattach_one() never allocates the new area even if it is needed. This patch gives the doalloc arg to xfs_qm_dqget() in xfs_qm_dqattach_one() to fix this problem. Signed-off-by: Mitsuo Hayasaka <mitsuo.hayasaka.hu@hitachi.com> Cc: Alex Elder <aelder@sgi.com> Cc: Christoph Hellwig <hch@infradead.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Ben Myers <bpm@sgi.com>
2011-11-15drm/radeon/kms: fix segfault in pm reworkAlex Deucher
Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-11-15drm/radeon/kms: fix up gpio i2c mask bits for r4xxAlex Deucher
Fixes i2c test failures when i2c_algo_bit.bit_test=1. The hw doesn't actually require a mask, so just set it to the default mask bits for r1xx-r4xx radeon ddc. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@kernel.org Cc: Jean Delvare <khali@linux-fr.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-11-15drm/radeon: add some missing FireMV pci idsAlex Deucher
Noticed by Egbert. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@kernel.org Cc: Egbert Eich <eich@suse.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-11-15Linux 3.2-rc2v3.2-rc2Linus Torvalds
2011-11-15Merge branch 'iommu/fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu * 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: iommu: omap: Fix compile failure
2011-11-15Merge branch 'fixes' of git://git.linaro.org/people/triad/linux-pinctrlLinus Torvalds
* 'fixes' of git://git.linaro.org/people/triad/linux-pinctrl: pinctrl: hide subsystem from the populace pinctrl: fix "warning: 'struct pinctrl_dev' declared inside parameter list"
2011-11-15Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: fsl-rio: fix compile error
2011-11-15Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6: gpio: pca953x: propagate the errno from the chip_init functions gpio: pca953x: remove unneeded check for chip type gpio/omap: check return value from irq_alloc_generic_chip gpio/omap: replace MOD_REG_BIT macro with static inline
2011-11-15Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin: blackfin: Fixup export.h includes Blackfin: add serial TX IRQ in individual platform resource
2011-11-15hfs: add sanity check for file name lengthDan Carpenter
On a corrupted file system the ->len field could be wrong leading to a buffer overflow. Reported-and-acked-by: Clement LECIGNE <clement.lecigne@netasq.com> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Cc: stable@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-11-15Net, libertas: Resolve memory leak in if_spi_host_to_card()Jesper Juhl
If we hit the default case in the switch in if_spi_host_to_card() we'll leak the memory we allocated for 'packet'. This patch resolves the leak by freeing the allocated memory in that case. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Acked-by: Dan Williams <dcbw@redhat.com> Cc: stable@vger.kernel.org Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-15rt2x00: Fix sleep-while-atomic bug in powersaving code.Gertjan van Wingerde
The generic powersaving code that determines after reception of a frame whether the device should go back to sleep or whether is could stay awake was calling rt2x00lib_config directly from RX tasklet context. On a number of the devices this call can actually sleep, due to having to confirm that the sleeping commands have been executed successfully. Fix this by moving the call to rt2x00lib_config to a workqueue call. This fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=731672 Tested-by: Tomas Trnka <tomastrnka@gmx.com> Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com> Cc: <stable@vger.kernel.org> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-15rt2x00: Add USB device ID of Buffalo WLI-UC-GNHP.Gertjan van Wingerde
This is reported to be an RT3070 based device. Reported-by: Teika Kazura <teika@lavabit.com> Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-11-15iwlegacy: remove unused IL_AC_UNSET defineStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: change IL_ERR to D_HT in iwl4965_rs_tl_turn_on_agg_for_tidGreg Dietsche
This message should be a debug message and not an error. Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: change IL_WARN to D_HT in il4965_tx_agg_startGreg Dietsche
This message should be a debug message and not a warning. Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: checkpatch.pl fixesStanislaw Gruszka
Fix most checkpatch.pl ERRORs and some WARNINGs. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: indentions and whitespacesStanislaw Gruszka
Process iwlegacy source files using: indent -npro -l500 -nhnl indent -npro -kr -i8 -ts8 -sob -l80 -nbbo -ss -ncs -cp1 -il0 -psl Plus manual compilation fixes. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: merge iwl-debug.h into common.hStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: rename iwl-debug.c to debug.cStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: merge iwl-fh.h into 4965.hStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: use FH49_ prefix in 4965 codeStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: use FH39_ prefix in 3945 codeStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: rename iwl-prph.h to prph.hStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: merge iwl-{eeprom,led}.h into common.hStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: merge iwl-power.h into common.hStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: merge iwl-legacy-rs.h into common.hStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: remove iwl-helpers.hStanislaw Gruszka
This file was already merged into common.h Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: merge common header filesStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: rename iwl-core.h to common.hStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: rename iwl-csr.h to csr.hStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: move IL_MASKStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: remove il_ieee80211_get_hw_confStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: rename iwl-commands.h to commands.hStanislaw Gruszka
On the way remove also not needed iwl-fh.h include. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: rename module nameStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: merge common .c filesStanislaw Gruszka
Merge iwl-{tx,rx,sta,scan,power,eeprom,led,hcmd}.c into common.c . Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: rename iwl-core.c to common.cStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: rename other handlersStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: s/rx_reply/hdl/Stanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: s/rx_handler/handler/Stanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: rename REPLY_ to N_ or C_Stanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: s/STATISTICS/STATS/Stanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: s/STATUS_/S_/Stanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: move iwl-3945-{,hw,fh,debugfs}.h to 3945.hStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
2011-11-15iwlegacy: move iwl-4965-{,hw,debugfs,calib}.h to 4965.hStanislaw Gruszka
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>