Eric Lee / smarc-fsl-linux-kernel

10 Jun, 2011

2 commits

08 Jun, 2011

12 commits

  • 53aebb531   staging: iio: error case memory leak fix ... Browse Code »

    The data pointer should be freed in the error
    cases of adis16400_trigger_handler().

    Signed-off-by: Andre Bartke
    Acked-by: Jonathan Cameron
    Signed-off-by: Greg Kroah-Hartman

    Andre Bartke
     
  • 0d422f423   staging: ath6kl: Fix a kernel panic during suspend/resume ... Browse Code »

    The kernel panic happens when we try to complete a pending
    scan request while going to suspend state. The cause for this
    kernel panic is accessing a freed memory (ar->arWmin). This
    is freed before ar6k_cfg80211_scanComplete_event() getting
    called where it is dereferenced.

    RIP: 0010:[] [] wlan_iterate_nodes+0x16/0xc0 [ath6kl]
    RSP: 0018:ffff8800719fbce8 EFLAGS: 00010296
    RAX: ffff880071bbcc00 RBX: ffff880037b22520 RCX: ffff880077413c80
    RDX: ffff880037b221c0 RSI: ffffffffa041ef10 RDI: 0000000000000020
    RBP: ffff8800719fbd18 R08: 0000000000000001 R09: 0000000000000001
    R10: 0000000000000400 R11: 0000000000000000 R12: 0000000000000010
    R13: ffff8800719fbdd8 R14: 00007fff83a84b60 R15: 0000000000000001
    FS: 00007fdccb8a7700(0000) GS:ffff880077400000(0000) knlGS:0000000000000000
    CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
    CR2: 0000000000000148 CR3: 0000000070604000 CR4: 00000000000006f0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    Process rmmod (pid: 1998, threadinfo ffff8800719fa000, task ffff880066712d80)
    Stack:
    0000000000000000 ffff880037b22520 0000000000000010 ffff8800719fbdd8
    00007fff83a84b60 0000000000000001 ffff8800719fbd28 ffffffffa0429fe2
    ffff8800719fbd58 ffffffffa041ee5f ffff8800719fbd58 ffff880037b22520
    Call Trace:
    [] wmi_iterate_nodes+0x12/0x20 [ath6kl]
    [] ar6k_cfg80211_scanComplete_event+0x3f/0xf0 [ath6kl]
    [] ar6000_close+0x61/0x100 [ath6kl]
    [] __dev_close_many+0x96/0x100
    [] dev_close_many+0x9d/0x120
    [] rollback_registered_many+0xe8/0x290
    [] unregister_netdevice_queue+0x96/0x100
    [] unregister_netdev+0x20/0x30
    [] ar6000_destroy+0x119/0x180 [ath6kl]
    [] ar6k_cleanup_module+0x2a/0x33 [ath6kl]
    [] sys_delete_module+0x19e/0x270
    [] system_call_fastpath+0x16/0x1b
    Code: c3 0f 1f 40 00 48 89 df e8 68 ff ff ff eb df 66 0f 1f 44 00 00 55 48 89 e5 41 57 41 56 41 55 41 54 53 48 83 ec 08 0f 1f 44 00 00
    8b af 28 01 00 00 4c 8d 7f 08 49 89 fc 48 89 f3 49 89 d6 41
    RIP [] wlan_iterate_nodes+0x16/0xc0 [ath6kl]
    RSP

    Signed-off-by: Vasanthakumar Thiagarajan
    Signed-off-by: Greg Kroah-Hartman

    Vasanthakumar Thiagarajan
     
  • aaa5c6779   staging: gma500: get control from firmware framebuffer if conflicts ... Browse Code »

    Many Linux distributions would enable vesafb in order to display
    early stage boot splash. In this case, we will get garbled X
    Window screen if running X fbdev on psbfb.

    This is because fb0 is occupied by vesafb while psbfb is on fb1.
    They tried to drive the same pieces of hardware at the same
    time. With unmodified X start-up, it would try to use default
    fb0 framebuffer device and unfortunately it is now broken
    becaues fb1 supersedes it.

    We should let psbfb takeover framebuffer control from vesafb
    to get around this problem.

    See also commit : 4410f3910947dcea8672280b3adecd53cec4e85e

    Signed-off-by: Michael Chang
    Cc: Alan Cox
    Cc: stable
    Signed-off-by: Greg Kroah-Hartman

    Michael Chang
     
  • 3ab8be531   staging: gma500: Skip bogus LVDS VBT mode and check for LVDS before adding backlight ... Browse Code »

    On the Fit-PC2 the VBT reports an invalid fixed panel mode for LVDS, this gets
    in the way for SDVO. This patch makes VBT parsing skip the invalid mode. When
    there is no LVDS output the backlight support crashes so the patch also checks
    for this before enabling it.

    Signed-off-by: Patrik Jakobsson
    Signed-off-by: Alan Cox
    Signed-off-by: Greg Kroah-Hartman

    Patrik Jakobsson
     
  • d3ac07788   staging: usbip: bugfix prevent driver unbind ... Browse Code »

    Implemented pre_reset and post_reset methods of the driver to prevent the
    driver from being unbound upon a device reset. Because of this also the
    asynchronous reset introduced to prevent a race condition is no longer necessary
    (and sometimes causes problems, because it comes later then expected).

    Signed-off-by: Arjan Mels
    Cc: Greg Kroah-Hartman
    Cc: Takahiro Hirofuchi
    Cc: Max Vozeler
    Cc: usbip-devel
    Signed-off-by: Greg Kroah-Hartman

    Arjan Mels
     
  • c11c4eebd   staging: iio: industrialio-trigger: set iio_poll_func private_data ... Browse Code »

    Failure to set iio_poll_func private_data, causes zero pointer access
    violations in all consumer trigger handlers.

    Signed-off-by: Michael Hennerich
    Acked-by: Jonathan Cameron
    Signed-off-by: Greg Kroah-Hartman

    Michael Hennerich
     
  • cddac88f4   staging: rts_pstor: use bitwise operator instead of logical one ... Browse Code »

    Looks like a typo.

    Signed-off-by: Nicolas Kaiser
    Reviewed-by: Peter Huewe
    Signed-off-by: Greg Kroah-Hartman

    Nicolas Kaiser
     
  • 827e4a07e   staging: fix ath6kl build when CFG80211 is not enabled ... Browse Code »

    Fix build errors when CONFIG_CFG80211 is not enabled:

    drivers/built-in.o: In function `ar6k_cfg80211_deinit':
    (.text+0x189b71): undefined reference to `cfg80211_scan_done'
    drivers/built-in.o: In function `ar6k_cfg80211_deinit':
    (.text+0x189b86): undefined reference to `wiphy_unregister'
    drivers/built-in.o: In function `ar6k_cfg80211_deinit':
    (.text+0x189b8d): undefined reference to `wiphy_free'
    drivers/built-in.o: In function `ar6k_cfg80211_init':
    (.text+0x18add7): undefined reference to `wiphy_new'
    drivers/built-in.o: In function `ar6k_cfg80211_init':
    (.text+0x18ae48): undefined reference to `wiphy_register'
    drivers/built-in.o: In function `ar6k_cfg80211_tkip_micerr_event':
    (.text+0x18ae95): undefined reference to `cfg80211_michael_mic_failure'
    drivers/built-in.o: In function `ar6k_cfg80211_scan_node':
    (.text+0x18afb5): undefined reference to `__ieee80211_get_channel'
    drivers/built-in.o: In function `ar6k_cfg80211_scan_node':
    (.text+0x18afd2): undefined reference to `cfg80211_inform_bss_frame'
    drivers/built-in.o: In function `ar6k_cfg80211_disconnect_event':
    (.text+0x18b046): undefined reference to `cfg80211_ibss_joined'
    drivers/built-in.o: In function `ar6k_cfg80211_disconnect_event':
    (.text+0x18b176): undefined reference to `cfg80211_connect_result'
    drivers/built-in.o: In function `ar6k_cfg80211_disconnect_event':
    (.text+0x18b190): undefined reference to `cfg80211_disconnected'
    drivers/built-in.o: In function `ar6k_cfg80211_connect_event':
    (.text+0x18b291): undefined reference to `cfg80211_get_bss'
    drivers/built-in.o: In function `ar6k_cfg80211_connect_event':
    (.text+0x18b457): undefined reference to `cfg80211_put_bss'
    drivers/built-in.o: In function `ar6k_cfg80211_connect_event':
    (.text+0x18b4fa): undefined reference to `cfg80211_roamed'

    Signed-off-by: Randy Dunlap
    Cc: Luis R. Rodriguez
    Cc: Joe Perches
    Cc: Naveen Singh
    Signed-off-by: Peter Foley
    Signed-off-by: Greg Kroah-Hartman

    Randy Dunlap
     
  • e1c78de9a   staging: brcm80211: fix for 'multiple definition of wl_msg_level' build err ... Browse Code »

    Reported-by: Linus Torvalds
    Signed-off-by: Roland Vossen
    Signed-off-by: Greg Kroah-Hartman

    Roland Vossen
     
  • 91e623dec   staging: fix olpc_dcon build, needs BACKLIGHT_CLASS_DEVICE ... Browse Code »

    Fix olpc_dcon.c build by selecting the needed kconfig symbol
    BACKLIGHT_CLASS_DEVICE.

    olpc_dcon.c:(.text+0x11588b): undefined reference to `backlight_device_register'

    Signed-off-by: Randy Dunlap
    Cc: Andres Salomon
    Cc: Chris Ball
    Cc: Jon Nettleton
    Signed-off-by: Greg Kroah-Hartman

    Randy Dunlap
     
  • fe35a59e1   Staging: remove STAGING_EXCLUDE_BUILD option ... Browse Code »

    Part of the requirement to be in the staging tree is that the code must
    build, so let's make it easier for people to build the code to
    test/prove this out.

    Based on a recommendation from Linus to implement this.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     
  • 85ab9ee94   Staging: altera: move .h file to proper place ... Browse Code »

    Staging drivers should be self-contained, without files in the include/
    directories. So move the altera.h file back to the driver directory for
    now, until it moves out of the staging tree.

    Cc: Igor M. Liplianin
    Cc: Mauro Carvalho Chehab
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

27 May, 2011

1 commit

  • b7c2f0362   Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... Browse Code »

    * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
    gfs2: Drop __TIME__ usage
    isdn/diva: Drop __TIME__ usage
    atm: Drop __TIME__ usage
    dlm: Drop __TIME__ usage
    wan/pc300: Drop __TIME__ usage
    parport: Drop __TIME__ usage
    hdlcdrv: Drop __TIME__ usage
    baycom: Drop __TIME__ usage
    pmcraid: Drop __DATE__ usage
    edac: Drop __DATE__ usage
    rio: Drop __DATE__ usage
    scsi/wd33c93: Drop __TIME__ usage
    scsi/in2000: Drop __TIME__ usage
    aacraid: Drop __TIME__ usage
    media/cx231xx: Drop __TIME__ usage
    media/radio-maxiradio: Drop __TIME__ usage
    nozomi: Drop __TIME__ usage
    cyclades: Drop __TIME__ usage

    Linus Torvalds
     

26 May, 2011

2 commits

  • 3f5785ec3   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (89 commits)
    bonding: documentation and code cleanup for resend_igmp
    bonding: prevent deadlock on slave store with alb mode (v3)
    net: hold rtnl again in dump callbacks
    Add Fujitsu 1000base-SX PCI ID to tg3
    bnx2x: protect sequence increment with mutex
    sch_sfq: fix peek() implementation
    isdn: netjet - blacklist Digium TDM400P
    via-velocity: don't annotate MAC registers as packed
    xen: netfront: hold RTNL when updating features.
    sctp: fix memory leak of the ASCONF queue when free asoc
    net: make dev_disable_lro use physical device if passed a vlan dev (v2)
    net: move is_vlan_dev into public header file (v2)
    bug.h: Fix build with CONFIG_PRINTK disabled.
    wireless: fix fatal kernel-doc error + warning in mac80211.h
    wireless: fix cfg80211.h new kernel-doc warnings
    iwlagn: dbg_fixed_rate only used when CONFIG_MAC80211_DEBUGFS enabled
    dst: catch uninitialized metrics
    be2net: hash key for rss-config cmd not set
    bridge: initialize fake_rtable metrics
    net: fix __dst_destroy_metrics_generic()
    ...

    Fix up trivial conflicts in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

    Linus Torvalds
     
  • 22e95ac87   Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/lin… ... Browse Code »

    …ville/wireless-next-2.6

    David S. Miller
     

25 May, 2011

3 commits

24 May, 2011

2 commits

  • df462b3db   Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 ... Browse Code »

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (247 commits)
    [media] gspca - sunplus: Fix some warnings and simplify code
    [media] gspca: Fix some warnings tied to 'no debug'
    [media] gspca: Unset debug by default
    [media] gspca - cpia1: Remove a bad conditional compilation instruction
    [media] gspca - main: Remove USB traces
    [media] gspca - main: Version change to 2.13
    [media] gspca - stk014 / t613: Accept the index 0 in querymenu
    [media] gspca - kinect: Remove __devinitdata
    [media] gspca - cpia1: Fix some warnings
    [media] video/Kconfig: Fix mis-classified devices
    [media] support for medion dvb stick 1660:1921
    [media] tm6000: fix uninitialized field, change prink to dprintk
    [media] cx231xx: Add support for Iconbit U100
    [media] saa7134 add new TV cards
    [media] Use a more consistent value for RC repeat period
    [media] cx18: Move spinlock and vb_type initialisation into stream_init
    [media] tm6000: remove tm6010 sif audio start and stop
    [media] tm6000: remove unused exports
    [media] tm6000: add pts logging
    [media] tm6000: change from ioctl to unlocked_ioctl
    ...

    Linus Torvalds
     
  • 1f3a8e093   Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 ... Browse Code »

    * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (970 commits)
    staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_
    staging:iio: Trivial kconfig reorganization and uniformity improvements.
    staging:iio:documenation partial update.
    staging:iio: use pollfunc allocation helpers in remaining drivers.
    staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out.
    staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev.
    staging:iio:meter:ade7758: Use private data space from iio_allocate_device
    staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value.
    staging:iio: ring core cleanups + check if read_last available in lis3l02dq
    staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name.
    staging:iio: poll func allocation clean up.
    staging:iio:ad7780 trivial unused header cleanup.
    staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes
    staging:iio:adc:AD7780: Convert to new channel registration method
    staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv()
    staging:iio:adc: AD7606: Consitently use indio_dev
    staging:iio: Rip out helper for software rings.
    staging:iio:adc:AD7298: Use private data space from iio_allocate_device
    staging:iio: rationalization of different buffer implementation hooks.
    staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev.
    ...

    Fix up trivial conflicts in
    - drivers/staging/intel_sst/intelmid.c: patches applied in both branches
    - drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling
    - drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion

    Linus Torvalds
     

23 May, 2011

1 commit

  • 710421cc7   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (346 commits)
    ASoC: core: Don't set "(null)" as a driver name
    ALSA: hda - Use LPIB for ATI/AMD chipsets as default
    Revert "ALSA: hda - Use position_fix=3 as default for AMD chipsets"
    ASoC: Tegra: Fix compile when debugfs not enabled
    ASoC: spdif-dit: Add missing MODULE_*
    SOUND: OSS: Remove Au1550 driver.
    ALSA: hda - add Intel Panther Point HDMI codec id
    ALSA: emu10k1 - Add dB range to Bass and Treble for SB Live!
    ALSA: hda - Remove PCM mixer elements from Virtual Master of realtek
    ALSA: hda - Fix input-src parse in patch_analog.c
    ASoC: davinci-mcasp: enable ping-pong SRAM buffers
    ASoC: add iPAQ hx4700 machine driver
    ASoC: Asahi Kasei AK4641 codec driver
    ALSA: hda - Enable Realtek ALC269 codec input layer beep
    ALSA: intel8x0m: enable AMD8111 modem
    ALSA: HDA: Add jack detection for HDMI
    ALSA: sound, core, pcm_lib: fix xrun_log
    ASoC: Max98095: Move existing NULL check before pointer dereference.
    ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt
    ALSA: usb-audio - Add support for USB X-Fi S51 Pro
    ...

    Linus Torvalds
     

22 May, 2011

1 commit

21 May, 2011

16 commits