1
Commit Graph

119 Commits

Author SHA1 Message Date
Leonid V. Fedorenchik
255c040a42 Staging: cx25821: Change indent with spaces to tabs 18
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:43 +02:00
Leonid V. Fedorenchik
a39bea3a4e Staging: cx25821: Change indent with spaces to tabs 17
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:43 +02:00
Leonid V. Fedorenchik
eda59eb189 Staging: cx25821: Change indent with spaces to tabs 16
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:43 +02:00
Leonid V. Fedorenchik
3f3d9e4a54 Staging: cx25821: Change indent with spaces to tabs 15
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:43 +02:00
Leonid V. Fedorenchik
21377cdd5e Staging: cx25821: Change indent with spaces to tabs 14
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
55c37c0d6c Staging: cx25821: Change indent with spaces to tabs 13
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
20e8a366c0 Staging: cx25821: Change indent with spaces to tabs 12
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
0bf42c9e4f Staging: cx25821: Change indent with spaces to tabs 11
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
9eadb1711c Staging: cx25821: Change indent with spaces to tabs 10
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
fb5f2c8010 Staging: cx25821: Change indent with spaces to tabs 9
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
8ebbda49b7 Staging: cx25821: Change indent with spaces to tabs 8
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:42 +02:00
Leonid V. Fedorenchik
e6cf66c1c0 Staging: cx25821: Change indent with spaces to tabs 7
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
8e4ac0741f Staging: cx25821: Change indent with spaces to tabs 6
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
2ba5149861 Staging: cx25821: Change indent with spaces to tabs 5
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
84cd410e11 Staging: cx25821: Change indent with spaces to tabs 4
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
48eb80ba3d Staging: cx25821: Change indent with spaces to tabs 3
Change indent with spaces to tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
788d0f33b9 Staging: cx25821: Change indent with spaces to tabs 2
Change indent with spaces to use tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
69dfe45f7b Staging: cx25821: Change indent with spaces to tabs 1
Changed indent with spaces to use tabs.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
c2c311fd3b Staging: cx25821: Fix indent in comment
Change indent in comment to use tabs instead of spaces.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:41 +02:00
Leonid V. Fedorenchik
692cfb9bec Staging: cx25821: Fix obscure line endings
Fix obscure line endings to less obscure ones. Rationale: readability.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:40 +02:00
Leonid V. Fedorenchik
c1e6e24175 Staging: cx25821: Fix function signatures
Fix long function signatures (over 80 characters) and indent them
properly.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:40 +02:00
Leonid V. Fedorenchik
2748f26b6a Staging: cx25821: Fix labels' placement in cx25821-video.c
Delete whitespace before labels.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:45:40 +02:00
Yong Zhang
18e9351e45 staging: irq: Remove IRQF_DISABLED
This flag is a NOOP and can be removed now.

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-16 20:09:38 +02:00
Leonid V. Fedorenchik
41344f6f36 Staging: cx25821: Fix long lines in cx25821-video-upstream.h
Fix long lines in cx25821-video-upstream.h

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:07 +02:00
Leonid V. Fedorenchik
2b2d039507 Staging: cx25821: Fix long lines in cx25821-video-upstream.c
Fix long lines in cx25821-video-upstream.c

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:07 +02:00
Leonid V. Fedorenchik
269efc688e Staging: cx25821: Fix long lines in cx25821-video-upstream-ch2.h
Fix long lines in cx25821-video-upstream-ch2.h

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:07 +02:00
Leonid V. Fedorenchik
0b225970d2 Staging: cx25821: Fix long lines in cx25821-video-upstream-ch2.c
Fix long lines in cx25821-video-upstream-ch2.c

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:06 +02:00
Leonid V. Fedorenchik
6d71b8f223 Staging: cx25821: Fix wrong line endings in cx25821-video-upstream-ch2.c
Change obscure line endings to less obscure ones. Rationale: improve
readability.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:06 +02:00
Leonid V. Fedorenchik
cc9518fe14 Staging: cx25821: Fix labels' placement in cx25821-video-upstream-ch2.c
Delete whitespace characters before labels.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:06 +02:00
Leonid V. Fedorenchik
9737153bf0 Staging: cx25821: Replace :? by if-else in cx25821-video-upstream-ch2.c
Replace :? operator by if-else equivalent where it improves readability.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:06 +02:00
Leonid V. Fedorenchik
49acf735c1 Staging: cx25821: Fix long lines in cx25821-audio-upstream.h
Fix long lines in cx25821-audio-upstream.h

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:06 +02:00
Leonid V. Fedorenchik
54082f1db2 Staging: cx25821: Fix long lines in cx25821-audio-upstream.c
Fix long lines in cx25821-audio-upstream.c

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:06 +02:00
Leonid V. Fedorenchik
1531e889ab Staging: cx25821: Fix obscure line endings in cx25821-audio-upstream.c
Change obscure line endings to less obscure ones. Rationale: more
readable.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:06 +02:00
Leonid V. Fedorenchik
cc4600c9f4 Staging: cx25821: Fix too long lines in cx25821-audio.h
Fix too long lines in cx25821-audio.h

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:05 +02:00
Leonid V. Fedorenchik
7bfcbd6733 Staging: cx25821: Fix wrong statement indent in cx25821-i2c.c
Fix wrong brace placement and statement indent in cx25821-i2c.c

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:05 +02:00
Leonid V. Fedorenchik
1c2b552032 Staging: cx25821: Fix wrong statement indent in cx25821-core.c
Fix wrong brace placement and statement indent in cx25821-core.c

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:05 +02:00
Leonid V. Fedorenchik
0fe773df50 Staging: cx25821: Fix wrong statement indent in cx25821-cards.c
Fix wrong brace placement and statement indent in cx25821-cards.c

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:05 +02:00
Leonid V. Fedorenchik
00fc8958c9 Staging: cx25821: Use DEFINE_PCI_DEVICE_TABLE for cx25821_pci_tbl
Use DEFINE_PCI_DEVICE_TABLE for cx25821_pci_tbl

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:05 +02:00
Leonid V. Fedorenchik
8eea455e6d Staging: cx25821: Move EXPORT_SYMBOL() to the right place
Move EXPORT_SYMBOL(cx25821_set_gpiopin_direction) to the right place.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:05 +02:00
Leonid V. Fedorenchik
bde780a17a Staging: cx25821: Delete file cx25821-gpio.h
Delete file cx25821-gpio.h since it is not used.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:04 +02:00
Leonid V. Fedorenchik
6100c57942 Staging: cx25821: Rename member name in struct cx25821_dev
Rename _audio_upstream_channel_select to _audio_upstream_channel in
in struct cx25821_dev in cx25821.h and all usages of that struct member
as well, because _audio_upstream_channel_select is seems to be too long
for a variable name.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:04 +02:00
Leonid V. Fedorenchik
7ae70c8b8c Staging: cx25821: Get rid of typedef in cx25821.h
Get rid of typedef in cx25821.h

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-09-12 16:46:04 +02:00
Joe Perches
95cd17c9f3 staging: Remove unnecessary semicolons when switch (foo) {...};
Done via perl script:

$ cat remove_semi_switch.pl
my $match_balanced_parentheses = qr/(\((?:[^\(\)]++|(?-1))*\))/;
my $match_balanced_braces      = qr/(\{(?:[^\{\}]++|(?-1))*\})/;

foreach my $file (@ARGV) {
    my $f;
    my $text;
    my $oldtext;

    next if ((-d $file));

    open($f, '<', $file)
	or die "$P: Can't open $file for read\n";
    $oldtext = do { local($/) ; <$f> };
    close($f);

    next if ($oldtext eq "");

    $text = $oldtext;

    my $count = 0;
    do {
	$count = 0;
	$count += $text =~ s@\b(switch\s*${match_balanced_parentheses}\s*)${match_balanced_braces}\s*;@"$1$3"@egx;
    } while ($count > 0);

    if ($text ne $oldtext) {
	my $newfile = $file;

	open($f, '>', $newfile)
	    or die "$P: Can't open $newfile for write\n";
	print $f $text;
	close($f);
    }
}

$

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-04-25 16:58:35 -07:00
Julia Lawall
e2ce504977 drivers/staging/cx25821/cx25821-video.c: introduce missing kfree
Error handling code following a kmalloc should free the allocated data.

The semantic match that finds the problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@r exists@
local idexpression x;
statement S;
expression E;
identifier f,f1,l;
position p1,p2;
expression *ptr != NULL;
@@

x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x == NULL) S
<... when != x
     when != if (...) { <+...x...+> }
(
x->f1 = E
|
 (x->f1 == NULL || ...)
|
 f(...,x->f1,...)
)
...>
(
 return \(0\|<+...x...+>\|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)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-04-20 14:11:47 -07:00
Linus Torvalds
76d21c5635 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
  [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
  [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
  [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
  [media] v4l: soc-camera: Store negotiated buffer settings
  [media] rc: interim support for 32-bit NEC-ish scancodes
  [media] mceusb: topseed 0x0011 needs gen3 init for tx to work
  [media] lirc_zilog: error out if buffer read bytes != chunk size
  [media] lirc: silence some compile warnings
  [media] hdpvr: use same polling interval as other OS
  [media] ir-kbd-i2c: pass device code w/key in hauppauge case
  [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
  [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
  [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
  [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
  [media] rc-rc5-hauppauge-new: Add support for the old Black RC
  [media] rc-rc5-hauppauge-new: Add the old control to the table
  [media] rc-winfast: Fix the keycode tables
  [media] a800: Fix a few wrong IR key assignments
  [media] opera1: Use multimedia keys instead of an app-specific mapping
  [media] dw2102: Use multimedia keys instead of an app-specific mapping
  ...

Fix up trivial conflicts (remove/modify and some real conflicts) in:
	arch/arm/mach-omap2/devices.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/dabusb/dabusb.c
	drivers/staging/dabusb/dabusb.h
	drivers/staging/easycap/easycap_ioctl.c
	drivers/staging/usbvideo/usbvideo.c
	drivers/staging/usbvideo/vicam.c
2011-03-24 09:50:13 -07:00
Arnd Bergmann
0cd301f19a [media] staging/cx25721: serialize access to devlist
Out of the three files accessing the device list,
one uses a mutex, one uses the BKL and one does
not have any locking. That is of course pointless,
so let's make all of them use the same mutex,
and get rid of one more BKL user.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Palash Bandyopadhyay <palash.bandyopadhyay@conexant.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-03-21 20:32:41 -03:00
Ilia Mirkin
b00917802b staging: cx25821: Remove NULL check before kfree
This patch was generated by the following semantic patch:
// <smpl>
@@ expression E; @@
- if (E != NULL) { kfree(E); }
+ kfree(E);

@@ expression E; @@
- if (E != NULL) { kfree(E); E = NULL; }
+ kfree(E);
+ E = NULL;
// </smpl>

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-03-14 11:57:31 -07:00
Linus Torvalds
949f6711b8 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
  staging: speakup: fix failure handling
  staging: usbip: remove double giveback of URB
  Staging: batman-adv: Remove batman-adv from staging
  Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
  staging: hv: remove unneeded osd_schedule_callback
  staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
  staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
  staging: brcm80211: Fix WL_<type> logging macros
  Staging: IIO: DDS: AD9833 / AD9834 driver
  Staging: IIO: dds.h convenience macros
  Staging: IIO: Direct digital synthesis abi documentation
  staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
  staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
  staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
  staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
  staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
  staging: brcm80211: Remove unused ether_<foo> #defines and struct
  staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
  staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
  Staging: comedi: Fix checkpatch.pl issues in file s526.c
  ...

Fix up trivial conflict in drivers/video/udlfb.c
2011-01-10 16:04:53 -08:00
Mauro Carvalho Chehab
a7862aa90f [media] cx25821: Fix compilation breakage due to BKL dependency
drivers/staging/cx25821/cx25821-video.c: In function ‘video_open’:
drivers/staging/cx25821/cx25821-video.c:817:8: error: implicit declaration of function ‘lock_kernel’
drivers/staging/cx25821/cx25821-video.c:834:9: error: implicit declaration of function ‘unlock_kernel’

This patch just adds a header with BKL function. It should be enough
to avoid compilation breakage, but, as BKL will be removed, we need
to properly fix it on a latter patch.

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Reported-by: Anca Emanuel <anca.emanuel@gmail.com>
Cc: Palash Bandyopadhyay <Palash.Bandyopadhyay@conexant.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-01-05 13:41:40 -02:00
Hans Verkuil
657f227105 [media] v4l: fix handling of v4l2_input.capabilities
The v4l core sets the v4l2_input.capabilities field based on the supplied
v4l2_ioctl_ops. However, several drivers do a memset or memcpy of the v4l2_input
struct, thus overwriting that field incorrectly.

Either remove the memset (which is already done by the v4l core), or add the
proper capabilities field in case of a memcpy.

The same is also true for v4l2_output, but that only affected the ivtv driver.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-12-30 08:02:29 -02:00