Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

This reverts commit c61c3094a630b2f795addc3a74fbd5ff7f704ca9.

+5 -9
+5 -9
drivers/staging/media/go7007/go7007-usb.c
··· 1057 1057 char *name; 1058 1058 int video_pipe, i, v_urb_len; 1059 1059 1060 - printk(KERN_DEBUG "go7007-usb: probing new board\n"); 1060 + dev_dbg(go->dev, "probing new GO7007 USB board\n"); 1061 1061 1062 1062 switch (id->driver_info) { 1063 1063 case GO7007_BOARDID_MATRIX_II: ··· 1097 1097 board = &board_px_tv402u; 1098 1098 break; 1099 1099 case GO7007_BOARDID_LIFEVIEW_LR192: 1100 - printk(KERN_ERR 1101 - "The Lifeview TV Walker Ultra is not supported. Sorry!\n"); 1100 + dev_err(go->dev, "The Lifeview TV Walker Ultra is not supported. Sorry!\n"); 1102 1101 return -ENODEV; 1103 - #if 0 1104 1102 name = "Lifeview TV Walker Ultra"; 1105 1103 board = &board_lifeview_lr192; 1106 1104 break; 1107 - #endif 1108 1105 case GO7007_BOARDID_SENSORAY_2250: 1109 - printk(KERN_INFO "Sensoray 2250 found\n"); 1106 + dev_info(go->dev, "Sensoray 2250 found\n"); 1110 1107 name = "Sensoray 2250/2251"; 1111 1108 board = &board_sensoray_2250; 1112 1109 break; ··· 1112 1115 board = &board_ads_usbav_709; 1113 1116 break; 1114 1117 default: 1115 - printk(KERN_ERR 1116 - "unknown board ID %d!\n", 1117 - (unsigned int)id->driver_info); 1118 + dev_err(go->dev, "unknown board ID %d!\n", 1119 + (unsigned int)id->driver_info); 1118 1120 return -ENODEV; 1119 1121 } 1120 1122