Eric Lee / smarc-fsl-linux-kernel

16 Jan, 2012

1 commit

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

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)
    [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver
    mb86a20s: Add a few more register settings at the init seq
    mb86a20s: Group registers into the same line
    [media] [PATCH] don't reset the delivery system on DTV_CLEAR
    [media] [BUG] it913x-fe fix typo error making SNR levels unstable
    [media] cx23885: Query the CX25840 during enum_input for status
    [media] cx25840: Add support for g_input_status
    [media] rc-videomate-m1f.c Rename to match remote controler name
    [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828
    [media] convert drivers/media/* to use module_platform_driver()
    [media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB
    [media] Exynos4 JPEG codec v4l2 driver
    [media] doc: v4l: selection: choose pixels as units for selection rectangles
    [media] v4l: s5p-tv: mixer: fix setup of VP scaling
    [media] v4l: s5p-tv: mixer: add support for selection API
    [media] v4l: emulate old crop API using extended crop/compose API
    [media] doc: v4l: add documentation for selection API
    [media] doc: v4l: add binary images for selection API
    [media] v4l: add support for selection api
    [media] hd29l2: fix review findings
    ...

    Linus Torvalds
     

13 Jan, 2012

2 commits

07 Jan, 2012

1 commit

  • ff4b8a57f   Merge branch 'driver-core-next' into Linux 3.2 ... Browse Code »

    This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
    and it fixes the build error in the arch/x86/kernel/microcode_core.c
    file, that the merge did not catch.

    The microcode_core.c patch was provided by Stephen Rothwell
    who was invaluable in the merge issues involved
    with the large sysdev removal process in the driver-core tree.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

06 Jan, 2012

3 commits

  • eabd0eaf4   [media] drivers/staging/media/as102/as102_usb_drv.c: shift position of allocation code ... Browse Code »

    The conditional after the kzalloc says that the tested expression should
    never be true, but if it were, the allocated data would have to be freed.
    This change just moves the allocation below the test, to avoid any
    possibility of the problem.

    A simplified version of the semantic match that finds the problem is as
    follows: (http://coccinelle.lip6.fr)

    //
    @r exists@
    local idexpression x;
    statement S;
    identifier f1;
    position p1,p2;
    expression *ptr != NULL;
    @@

    x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...);
    ...
    if (x == NULL) S
    }
    x->f1
    ...>
    (
    return \(0\|\|ptr\);
    |
    return@p2 ...;
    )

    @script:python@
    p1 << r.p1;
    p2 << r.p2;
    @@

    print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
    //

    Signed-off-by: Julia Lawall
    Signed-off-by: Mauro Carvalho Chehab

    Julia Lawall
     
  • aecf33db5   [media] Staging: dt3155v4l: probe() always fails ... Browse Code »

    There were some curly braces missing so the probe() function always
    failed.

    Signed-off-by: Dan Carpenter
    Signed-off-by: Mauro Carvalho Chehab

    Dan Carpenter
     
  • 527f18be2   [media] Staging: dt3155v4l: update to newer API ... Browse Code »

    I changed the function definitions for dt3155_queue_setup() to match the
    newer API. The dt3155_start_streaming() function didn't do anything so
    I just removed it.

    This silences the following gcc warnings:
    drivers/staging/media/dt3155v4l/dt3155v4l.c:307:2: warning: initialization from incompatible pointer type [enabled by default]
    drivers/staging/media/dt3155v4l/dt3155v4l.c:307:2: warning: (near initialization for ‘q_ops.queue_setup’) [enabled by default]
    drivers/staging/media/dt3155v4l/dt3155v4l.c:311:2: warning: initialization from incompatible pointer type [enabled by default]
    drivers/staging/media/dt3155v4l/dt3155v4l.c:311:2: warning: (near initialization for ‘q_ops.start_streaming’) [enabled by default]

    Signed-off-by: Dan Carpenter
    Acked-by: Marek Szyprowski
    Signed-off-by: Mauro Carvalho Chehab

    Dan Carpenter
     

05 Jan, 2012

1 commit

  • 6225f18b8   [media] Don't test for ops->info.type inside drivers ... Browse Code »

    Now, ops->info.type is handled inside the dvb_frontend
    core, only for DVBv3 calls, and according with the
    delivery system. So, drivers should not care or use it,
    otherwise, it may have issues with DVBv5 calls.

    The drivers that were still using it were detected via
    this small temporary hack:

    --- a/include/linux/dvb/frontend.h
    +++ b/include/linux/dvb/frontend.h
    @@ -29,13 +29,16 @@
    #include

    typedef enum fe_type {
    +#if defined(__DVB_CORE__) || !defined (__KERNEL__)
    FE_QPSK,
    FE_QAM,
    FE_OFDM,
    FE_ATSC
    +#else
    +FE_FOOO
    +#endif
    } fe_type_t;

    -
    typedef enum fe_caps {
    FE_IS_STUPID = 0,
    FE_CAN_INVERSION_AUTO = 0x1,

    Signed-off-by: Mauro Carvalho Chehab

    Mauro Carvalho Chehab
     

31 Dec, 2011

4 commits

30 Dec, 2011

1 commit

  • b4d48c942   Merge tag 'v3.2-rc7' into staging/for_v3.3 ... Browse Code »

    Linux 3.2-rc7

    * tag 'v3.2-rc7': (1304 commits)
    Linux 3.2-rc7
    netfilter: xt_connbytes: handle negation correctly
    Btrfs: call d_instantiate after all ops are setup
    Btrfs: fix worker lock misuse in find_worker
    net: relax rcvbuf limits
    rps: fix insufficient bounds checking in store_rps_dev_flow_table_cnt()
    net: introduce DST_NOPEER dst flag
    mqprio: Avoid panic if no options are provided
    bridge: provide a mtu() method for fake_dst_ops
    md/bitmap: It is OK to clear bits during recovery.
    md: don't give up looking for spares on first failure-to-add
    md/raid5: ensure correct assessment of drives during degraded reshape.
    md/linear: fix hot-add of devices to linear arrays.
    sparc64: Fix MSIQ HV call ordering in pci_sun4v_msiq_build_irq().
    pata_of_platform: Add missing CONFIG_OF_IRQ dependency.
    ipv4: using prefetch requires including prefetch.h
    VFS: Fix race between CPU hotplug and lglocks
    vfs: __read_cache_page should use gfp argument rather than GFP_KERNEL
    USB: Fix usb/isp1760 build on sparc
    net: Add a flow_cache_flush_deferred function
    ...

    Conflicts:
    drivers/media/common/tuners/tda18218.c
    drivers/media/video/omap3isp/ispccdc.c
    drivers/staging/media/as102/as102_drv.h

    Mauro Carvalho Chehab
     

26 Nov, 2011

1 commit

  • 87d466e50   [media] staging/media: lirc_imon: add a __user annotation ... Browse Code »

    This silences the following Sparse warnings:
    lirc_imon.c:404:32: warning: incorrect type in argument 1 (different address spaces)
    lirc_imon.c:404:32: expected void const [noderef] *
    lirc_imon.c:404:32: got char const *buf
    lirc_imon.c:117:28: warning: incorrect type in initializer (incompatible argument 2 (different address spaces))
    lirc_imon.c:117:28: expected long ( *write )( ... )
    lirc_imon.c:117:28: got long ( static [toplevel] * )( ... )

    Signed-off-by: Dan Carpenter
    Signed-off-by: Mauro Carvalho Chehab

    Dan Carpenter
     

25 Nov, 2011

19 commits

24 Nov, 2011

1 commit

  • 12cbfd0a3   Merge tag 'v3.2-rc2' into staging/for_v3.3 ... Browse Code »

    * tag 'v3.2-rc2': (3068 commits)
    Linux 3.2-rc2
    hfs: add sanity check for file name length
    fsl-rio: fix compile error
    blackfin: Fixup export.h includes
    Blackfin: add serial TX IRQ in individual platform resource
    virtio-pci: fix use after free
    ACPI / cpuidle: Remove acpi_idle_suspend (to fix suspend regression)
    drm/radeon/kms/combios: fix dynamic allocation of PM clock modes
    [CPUFREQ] db8500: fix build error due to undeclared i variable
    bma023: Add SFI translation for this device
    vrtc: change its year offset from 1960 to 1972
    ce4100: fix a build error
    arm/imx: fix imx6q mmc error when mounting rootfs
    arm/imx: fix AUTO_ZRELADDR selection
    arm/imx: fix the references to ARCH_MX3
    ARM: mx51/53: set pwm clock parent to ipg_perclk
    btrfs: rename the option to nospace_cache
    drm/radeon/kms/pm: switch to dynamically allocating clock mode array
    drm/radeon/kms: optimize r600_pm_profile_init
    drm/radeon/kms/pm: add a proper pm profile init function for fusion
    ...

    Conflicts:
    drivers/media/radio/Kconfig

    Mauro Carvalho Chehab
     

19 Nov, 2011

1 commit

  • bac2c126e   USB: convert drivers/staging/* to use module_usb_driver() ... Browse Code »

    This converts the drivers in drivers/staging/* to use the
    module_usb_driver() macro which makes the code smaller and a bit
    simpler.

    Added bonus is that it removes some unneeded kernel log messages about
    drivers loading and/or unloading.

    Cc: "David Täht"
    Cc: Marek Belisko
    Cc: Al Cho
    Cc: Forest Bond
    Cc: Pavel Machek
    Cc: Huajun Li
    Cc: Zac Storer
    Cc: Randy Dunlap
    Cc: Mauro Carvalho Chehab
    Cc: edwin_rong
    Cc: Ben Hutchings
    Cc: Julia Lawall
    Cc: Ilia Mirkin
    Cc: Joe Perches
    Cc: Pekka Enberg
    Cc: "John W. Linville"
    Cc: Paul Gortmaker
    Cc: Larry Finger
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

17 Nov, 2011

1 commit

  • d29387e8d   media/staging: fix allyesconfig build error ... Browse Code »

    Fix x86 allyesconfig builds. Builds fail due to a non-static variable
    named 'debug' in drivers/staging/media/as102:

    arch/x86/built-in.o:arch/x86/kernel/entry_32.S:1296: first defined here
    ld: Warning: size of symbol `debug' changed from 90 in arch/x86/built-in.o to 4 in drivers/built-in.o

    Thou shalt have no non-static identifiers that are named 'debug'.

    Signed-off-by: Randy Dunlap
    Cc: Pierrick Hascoet
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     

08 Nov, 2011

4 commits