lkml.org 
[lkml]   [2014]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the v4l-dvb tree with Linus' tree
Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/staging/media/go7007/go7007-usb.c between commits 66a528c1c3d6
("Revert "staging:media: Use dev_dbg() instead of pr_debug()"") and
e6bbda9da9e8 ("Staging: go7007: fix up some remaining go->dev issues")
from Linus' tree and commit c61c3094a630 ("[media] go7007-usb: only use
go->dev after allocated") from the v4l-dvb tree.

I fixed it up (I basically used the version from the patches in Linus'
tree (they are in v3.13-rc2) - see below) and can carry the fix as necessary (no action is
required).

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/staging/media/go7007/go7007-usb.c
index b658c2316df3,1d747de6dfa6..000000000000
--- a/drivers/staging/media/go7007/go7007-usb.c
+++ b/drivers/staging/media/go7007/go7007-usb.c
@@@ -1099,13 -1097,16 +1099,15 @@@ static int go7007_usb_probe(struct usb_
board = &board_px_tv402u;
break;
case GO7007_BOARDID_LIFEVIEW_LR192:
- printk(KERN_ERR
- "The Lifeview TV Walker Ultra is not supported. Sorry!\n");
+ dev_err(&intf->dev, "The Lifeview TV Walker Ultra is not supported. Sorry!\n");
return -ENODEV;
+ #if 0
name = "Lifeview TV Walker Ultra";
board = &board_lifeview_lr192;
break;
+ #endif
case GO7007_BOARDID_SENSORAY_2250:
- printk(KERN_INFO "Sensoray 2250 found\n");
+ dev_info(&intf->dev, "Sensoray 2250 found\n");
name = "Sensoray 2250/2251";
board = &board_sensoray_2250;
break;
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2014-01-14 07:01    [W:0.321 / U:0.280 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site