Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/radio/dsbr100.c between commit
59d1f04f76c8386d468f74c18fe5c008752c9340 ("USB: remove warn() macro from
usb.h") from the usb tree and commit
63057954eb49549963c4c5079381492575cab33a ("V4L/DVB (8778): radio: fix
incorrect video_register_device result check") from the v4l-dvb tree.
Just a context clash. I fixed it up (see below) and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/media/radio/dsbr100.c
index d8e3857,0f06e6f..0000000
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@@ -413,9 -412,9 +414,10 @@@ static int usb_dsbr100_open(struct inod
radio->muted = 1;
if (dsbr100_start(radio)<0) {
- warn("Radio did not start up properly");
+ dev_warn(&radio->usbdev->dev,
+ "Radio did not start up properly\n");
radio->users = 0;
+ unlock_kernel();
return -EIO;
}
dsbr100_setfreq(radio, radio->curfreq);
@@@ -496,8 -496,8 +499,8 @@@ static int usb_dsbr100_probe(struct usb
radio->usbdev = interface_to_usbdev(intf);
radio->curfreq = FREQ_MIN*FREQ_MUL;
video_set_drvdata(radio->videodev, radio);
- if (video_register_device(radio->videodev, VFL_TYPE_RADIO,radio_nr)) {
+ if (video_register_device(radio->videodev, VFL_TYPE_RADIO, radio_nr) < 0) {
- warn("Could not register video device");
+ dev_warn(&intf->dev, "Could not register video device\n");
video_device_release(radio->videodev);
kfree(radio->transfer_buffer);
kfree(radio);
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
