Commit b464f6b6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

Revert "[media] go7007-usb: only use go->dev after allocated"

This patch conflicts with commits 66a528c1, with also fixes the
bug and got merged on v3.13-rc2.

This reverts commit c61c3094.
parent bf6e8aaa
...@@ -1057,7 +1057,7 @@ static int go7007_usb_probe(struct usb_interface *intf, ...@@ -1057,7 +1057,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
char *name; char *name;
int video_pipe, i, v_urb_len; int video_pipe, i, v_urb_len;
printk(KERN_DEBUG "go7007-usb: probing new board\n"); dev_dbg(go->dev, "probing new GO7007 USB board\n");
switch (id->driver_info) { switch (id->driver_info) {
case GO7007_BOARDID_MATRIX_II: case GO7007_BOARDID_MATRIX_II:
...@@ -1097,16 +1097,13 @@ static int go7007_usb_probe(struct usb_interface *intf, ...@@ -1097,16 +1097,13 @@ static int go7007_usb_probe(struct usb_interface *intf,
board = &board_px_tv402u; board = &board_px_tv402u;
break; break;
case GO7007_BOARDID_LIFEVIEW_LR192: case GO7007_BOARDID_LIFEVIEW_LR192:
printk(KERN_ERR dev_err(go->dev, "The Lifeview TV Walker Ultra is not supported. Sorry!\n");
"The Lifeview TV Walker Ultra is not supported. Sorry!\n");
return -ENODEV; return -ENODEV;
#if 0
name = "Lifeview TV Walker Ultra"; name = "Lifeview TV Walker Ultra";
board = &board_lifeview_lr192; board = &board_lifeview_lr192;
break; break;
#endif
case GO7007_BOARDID_SENSORAY_2250: case GO7007_BOARDID_SENSORAY_2250:
printk(KERN_INFO "Sensoray 2250 found\n"); dev_info(go->dev, "Sensoray 2250 found\n");
name = "Sensoray 2250/2251"; name = "Sensoray 2250/2251";
board = &board_sensoray_2250; board = &board_sensoray_2250;
break; break;
...@@ -1115,8 +1112,7 @@ static int go7007_usb_probe(struct usb_interface *intf, ...@@ -1115,8 +1112,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
board = &board_ads_usbav_709; board = &board_ads_usbav_709;
break; break;
default: default:
printk(KERN_ERR dev_err(go->dev, "unknown board ID %d!\n",
"unknown board ID %d!\n",
(unsigned int)id->driver_info); (unsigned int)id->driver_info);
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment