aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-11-17net: fix mdio section mismatch warningStephen Rothwell1-1/+1
This fixes the following warning: WARNING: drivers/net/phy/built-in.o(.devexit.text+0x70): Section mismatch in reference from the function .mdio_gpio_bus_destroy() to the function .devinit.text:.mdio_gpio_bus_deinit() The function __devexit .mdio_gpio_bus_destroy() references a function __devinit .mdio_gpio_bus_deinit(). This is often seen when error handling in the exit function uses functionality in the init path. The fix is often to remove the __devinit annotation of .mdio_gpio_bus_deinit() so it may be used outside an init section. Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-16ppp: fix BUG on non-linear SKB (multilink receive)Ben McKeegan1-2/+9
PPP does not correctly call pskb_may_pull() on all necessary receive paths before reading the PPP protocol, thus causing PPP to report seemingly random 'unsupported protocols' and eventually trigger BUG_ON(skb->len < skb->data_len) in skb_pull_rcsum() when receiving multilink protocol in non-linear skbs. ppp_receive_nonmp_frame() does not call pskb_may_pull() before reading the protocol number. For the non-mp receive path this is not a problem, as this check is done in ppp_receive_frame(). For the mp receive path, ppp_mp_reconstruct() usually copies the data into a new linear skb. However, in the case where the frame is made up of a single mp fragment, the mp header is pulled and the existing skb used. This skb was then passed to ppp_receive_nonmp_frame() without checking if the encapsulated protocol header could safely be read. Signed-off-by: Ben McKeegan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-16ixgbe: Fixing EEH handler to handle more than one errorBreno Leitao1-0/+1
After commmit 4b77b0a2ba27d64f58f16d8d4d48d8319dda36ff EEH breaks after the second error, since it calls pci_restore_state() but it returns 0, since pci->state_saved is false. So, this patch just call pci_save_state() after pci_restore_state(). Signed-off-by: Breno Leitao <[email protected]> Acked-by: Peter P Waskiewicz Jr <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-16Merge branch 'master' of ↵David S. Miller6-165/+45
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2009-11-16Input: lifebook - fix settings for CF-72Abner Holsinger1-2/+1
Panasonic CF-72 uses 6-byte protocol and does not need to be tied to a particular port. Signed-off-by: Abner Holsinger <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2009-11-16Input: psmouse - fix breakage introduced by b7802c5c1eaJiri Kosina1-1/+1
Commit b7802c5c1ea ("Input: psmouse - use boolean type") caused the synaptics_hardware variable to be completely useless, as it is constantly set to 'true' throughout the whole psmouse_extensions(). This was caused by the following hunk in the commit in question - int synaptics_hardware = 0; + bool synaptics_hardware = true; which is wrong and causes driver to issue extra reset when falling back to bare PS/2 protocol. Signed-off-by: Jiri Kosina <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
2009-11-16omap: Fix keymap for zoom2 according to matrix keypad framworkVimal Singh1-44/+43
Interpretation of 'row' and 'col' got reversed in matrix keymap framework. Also last element '0', present in keymap array, is no more needed. Correcting zoom2 keyboard keymap accordingly. Signed-off-by: Vimal Singh <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
2009-11-16Merge branch 'fix' of ↵Russell King6-6/+9
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
2009-11-17[ARM] pxa: ensure mfp is in correct range in mfp_{read,write}Roel Kluin1-2/+2
Ensure we do not read/write outside array boundaries with a negative index. Signed-off-by: Roel Kluin <[email protected]> Signed-off-by: Eric Miao <[email protected]>
2009-11-17[ARM] pxa/hx4700: fix hx4700 touchscreen pressure valuesPaul Parsons1-1/+1
hx4700 touchscreen events were being dropped in ads7846_rx() because their pressure values consistently exceeded the platform maximum of 512; a sample of 256 pressure values were in the range 531 to 815. Doubling the platform maximum to 1024 allows hx4700 touchscreen events to pass the test. Signed-off-by: Paul Parsons <[email protected]> Signed-off-by: Eric Miao <[email protected]>
2009-11-16Merge branch 'for-rmk' of git://git.marvell.com/orionRussell King2-0/+11
2009-11-16ARM: 5787/1: U300 COH 901 331 fixesLinus Walleij2-1/+12
This will fix some small issues with the COH 901 331 RTC driver: - Interrupt is disabled after alarm so that we don't fire multiple interrupts. - We return 0 from the coh901331_alarm_irq_enable() ridding a compile warning. - We alter the name in the U300 device registry to match that of the driver so they sucessfully resolve. Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Russell King <[email protected]>
2009-11-16ARM: Fix warning in sa1100-flash.cRussell King1-2/+2
drivers/mtd/maps/sa1100-flash.c: In function 'sa1100_probe_subdev': drivers/mtd/maps/sa1100-flash.c:214: warning: format '%d' expects type 'int', but argument 3 has type 'uint64_t' Signed-off-by: Russell King <[email protected]>
2009-11-16at91: at91sam9g20ek modify dual slot evaluation kitNicolas Ferre2-17/+26
at91sam9g20ek rev. C and onwards embed two SD/MMC slots. This patch modify the previous dual slot board definition to match the official rev. C board. It also allows the use of at91_mci SD/MMC driver in addition to the atmel-mci one. Some pins have been re-affected from leds or Ethernet phy IRQ to the SD/MMC slot A. This lead to a modification of those definitions. Signed-off-by: Nicolas Ferre <[email protected]> Acked-by: Andrew Victor <[email protected]>
2009-11-16cifs: clear server inode number flag while autodisablingSuresh Jayaraman1-1/+1
Fix the commit ec06aedd44 that intended to turn off querying for server inode numbers when server doesn't consistently support inode numbers. Presumably the commit didn't actually clear the CIFS_MOUNT_SERVER_INUM flag, perhaps a typo. Signed-off-by: Suresh Jayaraman <[email protected]> Acked-by: Jeff Layton <[email protected]> Cc: Stable <[email protected]> Signed-off-by: Steve French <[email protected]>
2009-11-16dereferencing freed memory regulator_fixed_voltage_remove()Dan Carpenter1-3/+2
Don't dereference drvdata after it has been freed. regards, dan carpenter Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2009-11-16leds-gpio: fix possible crash on OF device unbindingDmitry Eremin-Solenikov1-0/+2
If there are leds present in the OF tree, but the GPIOs for (some) of them are unavailable, led_data doesn't get populated with correct devices. Then, on device unbinding, one can crash the kernel. Workaround this by setting led->gpio to invalid value early. Signed-off-by: Dmitry Eremin-Solenikov <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2009-11-16backlight: Fix backlight limiting on spitz/corgi devicesPavel Machek1-2/+3
On spitz (& similar) machines, if battery is running low, backlight needs to be limited to lower step. Unfortunately, current code uses &= for limiting, turning backlight off completely for some backlight settings. Fix that. Signed-off-by: Pavel Machek <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2009-11-16backlight: lcd - Fix wrong sizeofJean Delvare1-1/+1
Which is why I have always preferred sizeof(struct foo) over sizeof(var). Signed-off-by: Jean Delvare <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2009-11-16hwmon: (adt7475) Fix sysfs file namesJean Delvare1-6/+6
The adt7475 driver creates pwm#_auto_channel_temp attributes instead of the standard pwm#_auto_channels_temp. Fix it. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Hans de Goede <[email protected]> Cc: Jordan Crouse <[email protected]>
2009-11-16hwmon: (adt7475) Cache limits for 60 secondsJean Delvare1-1/+1
The comment says that limits are cached for 60 seconds but the code actually caches them for only 2 seconds. Align the code on the comment, as 60 seconds makes more sense. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Hans de Goede <[email protected]> Cc: Jordan Crouse <[email protected]>
2009-11-16hwmon: (adt7475) Fix temperature fault flagsJean Delvare1-2/+1
The logic of temperature fault flags is wrong, it shows faults when there are none and vice versa. Fix it. I can't believe this has been broken since the driver was added, 8 months ago, basically breaking temp1 and temp3, and nobody ever complained. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Hans de Goede <[email protected]> Cc: Jordan Crouse <[email protected]>
2009-11-16hwmon: (s3c-hwmon) Ignore invalid divider settingsBen Dooks1-2/+9
Avoid registering channels that have zero divider settings in them, as this will only lead to kernel OOPS from divide-by-zero when the sysfs entry is read. Signed-off-by: Ben Dooks <[email protected]> Signed-off-by: Jean Delvare <[email protected]>
2009-11-16net: Fix the rollback test in dev_change_name()Eric Dumazet1-5/+6
net: Fix the rollback test in dev_change_name() In dev_change_name() an err variable is used for storing the original call_netdevice_notifiers() errno (negative) and testing for a rollback error later, but the test for non-zero is wrong, because the err might have positive value as well - from dev_alloc_name(). It means the rollback for a netdevice with a number > 0 will never happen. (The err test is reordered btw. to make it more readable.) Signed-off-by: Jarek Poplawski <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-16Merge branch 'fix/hda' into for-linusTakashi Iwai4-10/+25
2009-11-16regulator: Fix check of unsigned return value and transmit errors in ↵Roel Kluin1-3/+3
wm831x_gp_ldo_get_mode() If ret is unsigned, the checks for negative wm831x_reg_read() return values are wrong. The error value should be transmitted to its caller, e.g. wm831x_gp_ldo_get_status() which tests for a negative return value. Signed-off-by: Roel Kluin <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2009-11-16regulator: Handle missing constraints in _regulator_disable()Mark Brown1-1/+2
Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Liam Girdwood <[email protected]>
2009-11-16ALSA: ice1724 - make some bitfields unsignedDan Carpenter1-2/+2
This is a clean up and doesn't change the behavior. Bit fields should always be unsigned. Otherwise pm_suspend_enabled will be -1 when you want it to be 1. The other bad thing is that the sparse checker will complain 36 times if they aren't unsigned. The other bitfields in that struct are unsigned already. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2009-11-15Revert "isdn: isdn_ppp: Use SKB list facilities instead of home-grown ↵David S. Miller2-190/+164
implementation." This reverts commit 38783e671399b5405f1fd177d602c400a9577ae6. It causes kernel bugzilla #14594 Signed-off-by: David S. Miller <[email protected]>
2009-11-15TI Davinci EMAC : Fix Console Hang when bringing the interface downSriram1-3/+0
In the NAPI poll function(emac_poll), check for netif_running() is unnecassary. In addition to associated runtime overhead, it also results in a continuous softirq loop when the interface is brought down under heavy traffic(tested wit Traffic Generator). Once the interface is disabled, the poll function always returns zero(with the check for netif_running) and napi_complete() would never get called resulting in softirq loop. Signed-off-by: Sriramakrishnan <[email protected]> Acked-by: Chaithrika U S <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-15smsc911x: Fix Console Hang when bringing the interface down.Sriram1-1/+1
In the NAPI poll function, check for netif_running() is unnecassary. In addition to associated runtime overhead, it also results in continuous softirq loop when the interface is brought down under heavy traffic(tested with Traffic Generator).Once the interface is disabled, the poll function always returns zero(with the check for netif_running) and napi_complete() would never get called resulting in softirq loop. Signed-off-by: Sriramakrishnan <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-15mISDN: fix error return in HFCmulti_init()Roel Kluin1-1/+1
The returned error should stay negative Signed-off-by: Roel Kluin <[email protected]> Acked-by: Karsten Keil <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-15forcedeth: mac address fixStanislav O. Bezzubtsev1-4/+1
Use the existing random_ether_addr() to generate random MAC instead of doing it by-hand. Signed-off-by: Stanislav O. Bezzubtsev <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-15r6040: fix version printingFlorian Fainelli1-1/+1
The version string already contains the printk level specifying it again results in the following message being printed: <6>r6040: RDC R6040 NAPI ... Signed-off-by: Florian Fainelli <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2009-11-15Merge branch 'master' of ↵David S. Miller2-4/+10
git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
2009-11-16Bluetooth: Fix regression with L2CAP configuration in Basic ModeGustavo F. Padovan1-3/+8
Basic Mode is the default mode of operation of a L2CAP entity. In this case the RFC (Retransmission and Flow Control) configuration option should not be used at all. Normally remote L2CAP implementation should just ignore this option, but it can cause various side effects with other Bluetooth stacks that are not capable of handling unknown options. Signed-off-by: Gustavo F. Padovan <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2009-11-16Bluetooth: Select Basic Mode as default for SOCK_SEQPACKETGustavo F. Padovan1-1/+1
The default mode for SOCK_SEQPACKET is Basic Mode. So when no mode has been specified, Basic Mode shall be used. This is important for current application to keep working as expected and not cause a regression. Signed-off-by: Gustavo F. Padovan <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2009-11-16Bluetooth: Set general bonding security for ACL by defaultAndrei Emeltchenko1-0/+1
This patch fixes double pairing issues with Secure Simple Paring support. It was observed that when pairing with SSP enabled, that the confirmation will be asked twice. http://www.spinics.net/lists/linux-bluetooth/msg02473.html This also causes bug when initiating SSP connection from Windows Vista. The reason is because bluetoothd does not store link keys since HCIGETAUTHINFO returns 0. Setting default to general bonding fixes these issues. Signed-off-by: Andrei Emeltchenko <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
2009-11-15Makefile: Add -Wmising-prototypes to HOSTCFLAGSJosh Triplett1-1/+1
Now that all host programs use static for all private functions and forward prototypes for all extern functions, add -Wmissing-prototypes to HOSTCFLAGS in the hopes of keeping it that way. All versions of GCC supported by the kernel handle -Wmissing-prototypes. Signed-off-by: Josh Triplett <[email protected]>
2009-11-15oss: Mark loadhex static in hex2hex.cJosh Triplett1-1/+1
Nothing outside of hex2hex.c references loadhex. Signed-off-by: Josh Triplett <[email protected]>
2009-11-15dtc: Mark various internal functions staticJosh Triplett3-3/+3
Signed-off-by: Josh Triplett <[email protected]>
2009-11-15dtc: Set "noinput" in the lexer to avoid an unused functionJosh Triplett2-17/+54
Regenerate the corresponding generated lexer. Regenerating the lexer with current flex also provides prototypes for various yy* functions, making some -Wmissing-prototypes warnings go away as well. Signed-off-by: Josh Triplett <[email protected]>
2009-11-15drm: radeon: Mark several functions static in mkregtableJosh Triplett1-6/+6
Signed-off-by: Josh Triplett <[email protected]>
2009-11-15arch/sparc/boot/*.c: Mark various internal functions staticJosh Triplett3-10/+10
Signed-off-by: Josh Triplett <[email protected]>
2009-11-15arch/powerpc/boot/addRamDisk.c: Mark several internal functions staticJosh Triplett1-3/+3
Nothing outside of arch/powerpc/boot/addRamDisk.c references the functions "get4k", "put4k", or "death". Signed-off-by: Josh Triplett <[email protected]>
2009-11-15arch/alpha/boot/tools/objstrip.c: Mark "usage" staticJosh Triplett1-1/+1
Nothing outside of arch/alpha/boot/tools/objstrip.c references the usage function. Signed-off-by: Josh Triplett <[email protected]>
2009-11-15Documentation/vm/page-types.c: Declare checked_open staticJosh Triplett1-1/+1
Nothing outside of Documentation/vm/page-types.c references checked_open. Signed-off-by: Josh Triplett <[email protected]>
2009-11-15genksyms: Mark is_reserved_word staticJosh Triplett2-45/+52
The genksyms keyword gperf hash provides a function is_reserved_word. genksyms #includes the resulting generated file keywords.c, so the function gets used only in the same source file that defines it. Mark is_reserved_word static, and regenerate the corresponding generated file. Signed-off-by: Josh Triplett <[email protected]>
2009-11-15kconfig: Mark various internal functions staticJosh Triplett6-15/+32
kconfig's keyword hash, lexer, and parser define various functions used only locally. Declare these functions as static, and regenerate the corresponding generated files. Signed-off-by: Josh Triplett <[email protected]>
2009-11-15ALSA: hda - Dell Studio 1557 hd-audio quirkDaniel J Blueman1-0/+2
Add the Dell Studio 15 (model 1557, Core i7) laptop to the hd-audio quirk list, enabling audio. Signed-off-by: Daniel J Blueman <[email protected]> Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>