summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* staging/easycap: Eliminate BKLMike Thomas2010-11-098-192/+695
| | | | | | | | | | No locking is required for normal operation of the driver, but locking is needed to prevent an Oops during some hot-unplugging scenarios. The BKL is replaced here by mutex locks together with traps to detect null pointers following asynchronous device disconnection. Signed-off-by: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging/easycap: Avoid compiler warning about frame size ... larger than ...Mike Thomas2010-11-091-59/+96
| | | | | | | | Replacing some of the large automatic variables by dynamically allocated variables in the IOCTL routines gets rid of the compiler warning. Signed-off-by: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging/easycap: Add option to set the hardware audio gainMike Thomas2010-11-094-47/+96
| | | | | | | | | A new module parameter adjusts the gain of the AC'97 audio chip, if one is present. Attenuation as well as amplification should be possible according to the datasheet, but attenuation seems not to work yet. Signed-off-by: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging/easycap: Add option to show conspicuous indication of signal lossMike Thomas2010-11-093-41/+112
| | | | | | | | | | A new module parameter turns on the option of displaying a testcard when the analogue input signal is lost (more precisely: when the hardware detects no field/frame synchronization). This feature has been requested in the context of security cameras used at night. Signed-off-by: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging/easycap: Implement interlaced modes and reduced frameratesMike Thomas2010-11-094-121/+579
| | | | | | | | Interlaced modes are requested by tvtime. Reduced framerates are preferred by some userspace programs, e.g. astronomy applications. Signed-off-by: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging/easycap: Improve hardware initializationMike Thomas2010-11-095-544/+1345
| | | | | | | | | | | Sometimes at startup the video urbs consistently and persistently deliver bad data, each video frame (not isoc frame) containing an excess of precisely two bytes. A brute-force cure implemented here is to repeatedly reinitialize the registers of the SAA7113H chip and the STK1160 USB bridge until good behaviour is obtained. Signed-off-by: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging/easycap: Make code re-entrantMike Thomas2010-11-097-1176/+1361
| | | | | | | | | In order to allow multiple EasyCAP dongles to operate simultaneously without mutual interference all static variables have been eliminated except for a persistent inventory of plugged-in dongles at module level. Signed-off-by: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* staging/easycap: Remove obsolete routinesMike Thomas2010-11-098-994/+198
| | | | | | | | | The so-called bridger routine has proved unnecessary following general improvements elsewhere. The explain_() functions were a convenience during early development, but are unnecessary and inappropriate now. Signed-off-by: Mike Thomas <rmthomas@sciolus.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* Staging: Merge Ben Collins solo6x10 tree with upstreamGreg Kroah-Hartman2010-11-0912-206/+565
|\ | | | | | | | | | | | | There were some duplicate changes that needed to be hand-merged due to fixes needed to keep .37 building and working properly. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * solo6x10: [P2M] Fix memory leakBen Collins2010-11-081-1/+4
| | | | | | | | Signed-off-by: Ben Collins <bcollins@bluecherry.net>
| * solo6x10: Implement working P2M descriptor more DMABen Collins2010-11-054-39/+38
| | | | | | | | | | | | | | | | | | | | We have to insert 1 dead descriptor first (all zereos), and then the real data descriptors after that. Everything uses descriptor mode now (8800 interrupts per second for display v4l2 is now down to ~96). Signed-off-by: Ben Collins <bcollins@bluecherry.net>
| * solo6x10: Updates to videobuf-dma-sg functions for latest kernelBen Collins2010-11-042-6/+6
| | | | | | | | Signed-off-by: Ben Collins <bcollins@bluecherry.net>
| * solo6x10: Conversion to videobuf-dma-sg (from dma-cont)Ben Collins2010-11-049-194/+554
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Full rewrite of the P2M DMA Engine to support scatter gather and take advantage of some of the features of the hardware. This includes using repeat DMA operations and line-mode transfers (for copying OSG and video display buffers). What isn't working: For some reason, descriptor mode is not working. I've implemented a psuedo version (still has one-interrupt per DMA operation), but we would get huge improvements if we could hand off a ring of descriptors to the P2M and get back one interrupt when it was done with all of them. Documentation is very vague on this, and even the ODM example code half attempts to get it right, but comments it out of the driver because it just doesn't work *sigh* Converts all v4l2 to dma-sg. So long slow dma-contiguous, but hello more interrupts :( Signed-off-by: Ben Collins <bcollins@bluecherry.net>
| * solo6x10: Update TODOBen Collins2010-11-041-4/+1
| | | | | | | | Signed-off-by: Ben Collins <bcollins@bluecherry.net>
| * solo6x10: Spaces to tabsBen Collins2010-11-042-9/+9
| | | | | | | | Signed-off-by: Ben Collins <bcollins@bluecherry.net>
* | pohmelfs: remove unneeded conditionals before calls to crypto_destroy_tfm ↵Jesper Juhl2010-11-091-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrappers. Hi, crypto_free_hash() and crypto_free_ablkcipher() are just wrappers around crypto_free_tfm() which is itself just a wrapper around crypto_destroy_tfm(). Passing crypto_destroy_tfm() a NULL pointer is valid, so there's no reason to check for NULL first. Removing the unneeded conditionals (which is what the patch does) brings us the benefit of having to execute a few fewer test/branch instructions and also reduces object code size slightly: before: text data bss dec hex filename 8630 112 3312 12054 2f16 drivers/staging/pohmelfs/crypto.o 0000000000000cbe <pohmelfs_crypto_engine_exit>: cbe: 55 push %rbp cbf: 48 89 e5 mov %rsp,%rbp cc2: 53 push %rbx cc3: 48 83 ec 08 sub $0x8,%rsp cc7: e8 00 00 00 00 callq ccc <pohmelfs_crypto_engine_exit+0xe> ccc: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cd3 <pohmelfs_crypto_engine_exit+0x15> cd3: 48 89 fb mov %rdi,%rbx cd6: 48 8b 7f 20 mov 0x20(%rdi),%rdi cda: 48 85 ff test %rdi,%rdi cdd: 74 0c je ceb <pohmelfs_crypto_engine_exit+0x2d> cdf: 48 ff 05 00 00 00 00 incq 0x0(%rip) # ce6 <pohmelfs_crypto_engine_exit+0x28> ce6: e8 58 fa ff ff callq 743 <crypto_free_hash> ceb: 48 8b 7b 28 mov 0x28(%rbx),%rdi cef: 48 85 ff test %rdi,%rdi cf2: 75 09 jne cfd <pohmelfs_crypto_engine_exit+0x3f> cf4: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cfb <pohmelfs_crypto_engine_exit+0x3d> cfb: eb 16 jmp d13 <pohmelfs_crypto_engine_exit+0x55> cfd: 48 89 fe mov %rdi,%rsi d00: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d07 <pohmelfs_crypto_engine_exit+0x49> d07: e8 00 00 00 00 callq d0c <pohmelfs_crypto_engine_exit+0x4e> d0c: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d13 <pohmelfs_crypto_engine_exit+0x55> d13: 48 8b 7b 18 mov 0x18(%rbx),%rdi d17: e8 00 00 00 00 callq d1c <pohmelfs_crypto_engine_exit+0x5e> d1c: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d23 <pohmelfs_crypto_engine_exit+0x65> d23: 5e pop %rsi d24: 5b pop %rbx d25: c9 leaveq d26: c3 retq after: text data bss dec hex filename 8604 112 3296 12012 2eec drivers/staging/pohmelfs/crypto.o 0000000000000cbe <pohmelfs_crypto_engine_exit>: cbe: 55 push %rbp cbf: 48 89 e5 mov %rsp,%rbp cc2: 53 push %rbx cc3: 48 83 ec 08 sub $0x8,%rsp cc7: e8 00 00 00 00 callq ccc <pohmelfs_crypto_engine_exit+0xe> ccc: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cd3 <pohmelfs_crypto_engine_exit+0x15> cd3: 48 89 fb mov %rdi,%rbx cd6: 48 8b 7f 20 mov 0x20(%rdi),%rdi cda: e8 64 fa ff ff callq 743 <crypto_free_hash> cdf: 48 8b 7b 28 mov 0x28(%rbx),%rdi ce3: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cea <pohmelfs_crypto_engine_exit+0x2c> cea: 48 89 fe mov %rdi,%rsi ced: e8 00 00 00 00 callq cf2 <pohmelfs_crypto_engine_exit+0x34> cf2: 48 8b 7b 18 mov 0x18(%rbx),%rdi cf6: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cfd <pohmelfs_crypto_engine_exit+0x3f> cfd: e8 00 00 00 00 callq d02 <pohmelfs_crypto_engine_exit+0x44> d02: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d09 <pohmelfs_crypto_engine_exit+0x4b> d09: 5e pop %rsi d0a: 5b pop %rbx d0b: c9 leaveq d0c: c3 retq Signed-off-by: Jesper Juhl <jj@chaosbits.net> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: batman-adv: Use linux/etherdevice.h address helper functionsTobias Klauser2010-11-095-24/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace custom ethernet address check functions by calls to the helpers in linux/etherdevice.h In one case where the address was tested for broadcast and multicast address, the broadcast address check can be omitted as broadcast is also a multicast address. The patch is only compile-tested. Cc: Marek Lindner <lindner_marek@yahoo.de> Cc: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> Cc: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Get rid of UINT typedef usage.Marek Belisko2010-11-092-5/+3
| | | | | | | | | | Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Get rid of PCHAR typedef usage.Marek Belisko2010-11-092-2/+1
| | | | | | | | | | Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Get rid of BOOLEAN typedef usage.Marek Belisko2010-11-095-9/+8
| | | | | | | | | | Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Get rid of ULONG typedef usage.Marek Belisko2010-11-093-29/+28
| | | | | | | | | | Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Get rid of PULONG typedef usage.Marek Belisko2010-11-091-1/+0
| | | | | | | | | | Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Get rid of USHORT typedef usage.Marek Belisko2010-11-096-89/+88
| | | | | | | | | | Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: GEt rid of PUSHORT typedef usage.Marek Belisko2010-11-094-14/+13
| | | | | | | | | | Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Get rid of UCHAR typedef.Marek Belisko2010-11-093-22/+21
| | | | | | | | | | Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Get rid of PUCHAR typedef.Marek Belisko2010-11-095-53/+52
| | | | | | | | | | | | | | PUCHAR typedef was replaces by u8 *. Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Check return value.Marek Belisko2010-11-091-2/+4
| | | | | | | | | | | | | | | | Function ft1000_submit_rx_urb() could fail so add checking for return value. Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Correct return error values.Marek Belisko2010-11-091-3/+3
| | | | | | | | | | Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Use common return point.Marek Belisko2010-11-091-14/+9
| | | | | | | | | | Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Use specific error codes instead self defined.Marek Belisko2010-11-091-17/+10
| | | | | | | | | | Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Pseudo header handlig improved.Marek Belisko2010-11-091-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | Handling for pseudo header was done by directly copying data to tx buffer. This hide a functionality and make code unreadable. Use approach where fill pseudo_hdr structure first with data and then copy to beginning of buffer. Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Remove dead code.Marek Belisko2010-11-093-203/+0
| | | | | | | | | | | | | | | | Remove functions which was used nowhere. Also remove dead variables used by this functions. Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: ft1000: Use memset instead looping with for.Marek Belisko2010-11-091-4/+1
| | | | | | | | | | Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Staging: w35und: Kill struct hwdata ->SurpriseRemoveCountPekka Enberg2010-11-091-2/+0
| | | | | | | | | | | | | | | | | | This patch kills the ->SurpriseRemoveCount member of struct hwdata. It's not used at all so it's safe to remove it. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Staging: w35und: Kill struct hwdata ->HwStopPekka Enberg2010-11-093-9/+6
| | | | | | | | | | | | | | | | | | This patch kills the ->HwStop member of struct hwdata. It's a read-only variable that's always zero so it's safe to remove it. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Staging: w35und: Kill struct hwdata ->NullPacketCountPekka Enberg2010-11-092-15/+0
| | | | | | | | | | | | | | | | | | This patch kills the NullPacketCount member of struct hwdata. It's not used for anything so it's safe to remove it. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Staging: w35und: Kill empty Mds_Destroy functionPekka Enberg2010-11-093-8/+0
| | | | | | | | | | | | | | | | The Mds_Destroy() function doesn't do anything so kill it. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Staging: frontier: fix space and * coding style issues in alphatrack.cMauro Schilman2010-11-091-2/+2
| | | | | | | | | | | | | | | | This is a patch to the alphatrack.c file that fixes up a space warning and a space after '*' warning found by the checkpatch.pl tool Signed-off-by: Mauro Schilman <maurito.s@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Staging: w35und: Rename wbhal_s.h to wbhal.hPekka Enberg2010-11-0911-10/+10
| | | | | | | | | | | | | | | | | | This patch renames the wbhal_s.h header file to wbhal.h now that it contains both structure and function definitions. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Staging: w35und: Merge wbhal_f.h to wbhal_s.hPekka Enberg2010-11-099-88/+90
| | | | | | | | | | | | | | | | This patch merges HAL struct and function definitions into one header file. Acked-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: vt6656: resolved checkpatch findingFelipe Andres Besoain Pino2010-11-091-2/+2
| | | | | | | | | | | | | | removed spaces at the start of a lines. Signed-off-by: Felipe Andres Besoain Pino <fbesoain@gnome.cl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: vt6656 resolved parenthesis not spacesAriel Savini2010-11-091-18/+19
| | | | | | | | | | | | | | removes before parenthesis Signed-off-by: Ariel Savini <arielsavini@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: vt6656: resolved checkpatch findingMariano Reingart2010-11-091-2/+1
| | | | | | | | | | | | | | removed a C99 '//' comment and added a space around '=' Signed-off-by: Mariano Reingart <reingart@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: vt6656: resolved checkpatch findingMatias De la Puente2010-11-091-1/+1
| | | | | | | | | | | | | | removed parentesis and spaces at the start of a line of a return Signed-off-by: Matias De la Puente <mfpuente.ar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Staging: solo6x10: Update WARN usesJoe Perches2010-11-091-1/+1
| | | | | | | | | | | | | | Add missing newlines. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: get rid of dev_base_lockEric Dumazet2010-11-091-2/+2
| | | | | | | | | | | | | | | | | | | | dev_base_lock was the legacy rwlock used to protect netdevice list, and is expected to vanish. We now use RTNL and RCU locking. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: iio: adis16209: tuning spi delay to make hardware more stableBarry Song2010-11-091-1/+1
| | | | | | | | | | | | | | | | Looks like one spot was missed in the previous spi tune patch. Signed-off-by: Barry Song <barry.song@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: iio: resolver: new driver for AD2S1210 devicesGraf Yang2010-11-093-0/+908
| | | | | | | | | | | | | | | | Signed-off-by: Graf Yang <graf.yang@analog.com> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: iio: resolver: new driver for AD2S1200/1205 devicesGraf Yang2010-11-093-0/+319
| | | | | | | | | | | | | | | | Signed-off-by: Graf Yang <graf.yang@analog.com> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | staging: iio: resolver: new driver for AD2S90 devicesGraf Yang2010-11-095-0/+177
| | | | | | | | | | | | | | | | | | | | This also kicks off the new resolver subsection. Signed-off-by: Graf Yang <graf.yang@analog.com> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
OpenPOWER on IntegriCloud