1. 16 Oct, 2013 33 commits
  2. 15 Oct, 2013 7 commits
    • Archana kumari's avatar
      staging:netlogic:Fixes commenting style in xlr_net.c · 2db0083d
      Archana kumari authored
      Fixes commenting style in xlr_net.c mentioned in
      drivers:staging:netlogic:TODO file
      Signed-off-by: default avatarArchana kumari <archanakumari959@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      2db0083d
    • Randy Dunlap's avatar
      staging/olpc_dcon: fix kconfig to fix build errors · d6ae99d0
      Randy Dunlap authored
      Fix build errors when GPIO_CS5535=m and FB_OLPC_DCON=y
      by preventing that kconfig combination.
      
      These build errors are caused by having a kconfig bool symbol
      (FB_OLPC_DCON_1) that depend on a tristate symbol (GPIO_CS5535),
      but when the tristate symbol is =m, the bool symbol is =y.
      
        drivers/built-in.o: In function `dcon_read_status_xo_1':
        olpc_dcon_xo_1.c:(.text+0x359531): undefined reference to `cs5535_gpio_set'
        drivers/built-in.o: In function `dcon_wiggle_xo_1':
        olpc_dcon_xo_1.c:(.text+0x35959f): undefined reference to `cs5535_gpio_set'
        olpc_dcon_xo_1.c:(.text+0x359610): undefined reference to `cs5535_gpio_clear'
        drivers/built-in.o:olpc_dcon_xo_1.c:(.text+0x3596a1): more undefined references to `cs5535_gpio_clear' follow
        drivers/built-in.o: In function `dcon_wiggle_xo_1':
        olpc_dcon_xo_1.c:(.text+0x359708): undefined reference to `cs5535_gpio_set'
        drivers/built-in.o: In function `dcon_init_xo_1':
        olpc_dcon_xo_1.c:(.text+0x35989b): undefined reference to `cs5535_gpio_clear'
        olpc_dcon_xo_1.c:(.text+0x3598b5): undefined reference to `cs5535_gpio_isset'
        olpc_dcon_xo_1.c:(.text+0x359963): undefined reference to `cs5535_gpio_setup_event'
        olpc_dcon_xo_1.c:(.text+0x359980): undefined reference to `cs5535_gpio_set_irq'
        olpc_dcon_xo_1.c:(.text+0x359a36): undefined reference to `cs5535_gpio_set'
      
      However, adding GPIO_CS5535 to the Kconfig dependencies also creates
      a kconfig recursive dependency error on powerpc:
        drivers/i2c/Kconfig:5:error: recursive dependency detected!
        drivers/i2c/Kconfig:5:	symbol I2C is selected by FB_OLPC_DCON
        drivers/staging/olpc_dcon/Kconfig:1:	symbol FB_OLPC_DCON depends on GPIO_CS5535
        drivers/gpio/Kconfig:577:	symbol GPIO_CS5535 depends on GPIOLIB
        drivers/gpio/Kconfig:38:	symbol GPIOLIB is selected by ARCH_REQUIRE_GPIOLIB
        drivers/gpio/Kconfig:23:	symbol ARCH_REQUIRE_GPIOLIB is selected by MCU_MPC8349EMITX
        arch/powerpc/platforms/Kconfig:351:	symbol MCU_MPC8349EMITX depends on I2C
      
      This is due to FB_OLPC_DCON selecting I2C instead of depending on it,
      so change the select to a dependency.
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Cc:	Daniel Drake <dsd@laptop.org>
      Cc:	Jens Frederich <jfrederich@gmail.com>
      Cc:	Jon Nettleton <jon.nettleton@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      d6ae99d0
    • Greg Kroah-Hartman's avatar
      Revert "staging/olpc: fix dependencies to fix build errors" · fcd70b4b
      Greg Kroah-Hartman authored
      This reverts commit 6170155d.
      
      It isn't correct.
      
      Cc: Randy Dunlap <rdunlap@infradead.org>
      Cc: Daniel Drake <dsd@laptop.org>
      Cc: Jens Frederich <jfrederich@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      fcd70b4b
    • Randy Dunlap's avatar
      staging/mt29f_spinand: fix build error when ONDIEECC not enabled · 3685ebc4
      Randy Dunlap authored
      Fix build error when CONFIG_MTD_SPINAND_ONDIEECC is not enabled
      by moving an inline function outside of that #ifdef block.
      
      drivers/staging/mt29f_spinand/mt29f_spinand.c: In function 'spinand_read_byte':
      drivers/staging/mt29f_spinand/mt29f_spinand.c:665:9: error: implicit declaration of function 'mtd_to_state' [-Werror=implicit-function-declaration]
      drivers/staging/mt29f_spinand/mt29f_spinand.c:665:32: warning: initialization makes pointer from integer without a cast [enabled by default]
      drivers/staging/mt29f_spinand/mt29f_spinand.c: In function 'spinand_write_buf':
      drivers/staging/mt29f_spinand/mt29f_spinand.c:700:32: warning: initialization makes pointer from integer without a cast [enabled by default]
      drivers/staging/mt29f_spinand/mt29f_spinand.c: In function 'spinand_read_buf':
      drivers/staging/mt29f_spinand/mt29f_spinand.c:707:32: warning: initialization makes pointer from integer without a cast [enabled by default]
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
      Cc: Kamlakant Patel <kamlakant.patel@broadcom.com>
      Cc: Mona Anonuevo <manonuevo@micron.com>
      Cc: linux-mtd@lists.infradead.org
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      3685ebc4
    • Malcolm Priestley's avatar
      staging: vt6656: return if pControlURB->hcpriv not NULL · e1feda13
      Malcolm Priestley authored
      Fixes occasional urb submitted while active.
      
      Even thought the fMP_CONTROL_WRITES/fMP_CONTROL_READS flags
      are cleared in the return context urb->hcpriv is not NULL.
      
      check for hcpriv and return STATUS_FAILURE if not NULL.
      Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      e1feda13
    • Malcolm Priestley's avatar
      staging: vt6656: Remove 10 second timer and move to BSSvSecondCallBack · 60cc2747
      Malcolm Priestley authored
      Remove sTimerTxData 10 second timer which triggers PSbSendNullPacket
      every 40 seconds when bLinkPass == true.
      
      Move the 40 second timer to the existing BSSvSecondCallBack
      one second delayed workqueue and trigger every 40 seconds when
      bLinkPass == true.
      Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      60cc2747
    • Malcolm Priestley's avatar
      staging: vt6656: return from workqueues on fMP_DISCONNECTED · 17f3ced0
      Malcolm Priestley authored
      Return from work queues on flag fMP_DISCONNECTED to prevent
      any scheduling threads past closing of device.
      Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      17f3ced0