Attachment #12349 for bug #7706

View | Details | Raw Unified | Return to bug 7706
Collapse All | Expand All

Lines 431-436 static int pcmcia_device_probe(struct device * dev) Link Here

(-)a/drivers/pcmcia/ds.c (+2 lines)
431		431
432	if ((!p_drv->probe) \|\| (!p_dev->function_config) \|\|	432	if ((!p_drv->probe) \|\| (!p_dev->function_config) \|\|
433	(!try_module_get(p_drv->owner))) {	433	(!try_module_get(p_drv->owner))) {
		434	ds_dbg(1, "bind failed. probe %p, function_config%p\n",
		435	p_drv->probe, p_dev->function_config);
434	ret = -EINVAL;	436	ret = -EINVAL;
435	goto put_dev;	437	goto put_dev;
436	}	438	}




/*
 * Debugging.
 */
#if 1
#define DEBUG_AUTOCONF(fmt...)	printk(fmt)
#else
#define DEBUG_AUTOCONF(fmt...)	do { } while (0)
#endif

#if 1
#define DEBUG_INTR(fmt...)	printk(fmt)
#else
#define DEBUG_INTR(fmt...)	do { } while (0)

	 * tells us whether we can probe for the type of port.
	 */
	ret = serial8250_request_std_resource(up);
	if (ret < 0) {
		printk(KERN_DEBUG "serial8250_config_port: serial8250_request_std_resource() returned %d\n", ret);
		return;
	}

	ret = serial8250_request_rsa_resource(up);
	if (ret < 0)

Lines 406-411 static int setup_serial(struct pcmcia_device handle, struct serial_info info, Link Here

(-)a/drivers/serial/serial_cs.c (+2 lines)
406	if (info->quirk && info->quirk->setup)	406	if (info->quirk && info->quirk->setup)
407	info->quirk->setup(handle, &port);	407	info->quirk->setup(handle, &port);
408		408
		409	printk(KERN_NOTICE "serial_cs: trying serial8250_register_port() with IO at "
		410	"0x%04lx, irq %d\n", (u_long)iobase, irq);
409	line = serial8250_register_port(&port);	411	line = serial8250_register_port(&port);
410	if (line < 0) {	412	if (line < 0) {
411	printk(KERN_NOTICE "serial_cs: serial8250_register_port() at "	413	printk(KERN_NOTICE "serial_cs: serial8250_register_port() at "

Return to bug 7706

Lines 58-70 static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS; Link Here

(-)a/drivers/serial/8250.c (-3 / +5 lines)
58	/*	58	/*
59	* Debugging.	59	* Debugging.
60	*/	60	*/
61	#if 0	61	#if 1
62	#define DEBUG_AUTOCONF(fmt...) printk(fmt)	62	#define DEBUG_AUTOCONF(fmt...) printk(fmt)
63	#else	63	#else
64	#define DEBUG_AUTOCONF(fmt...) do { } while (0)	64	#define DEBUG_AUTOCONF(fmt...) do { } while (0)
65	#endif	65	#endif
66		66
67	#if 0	67	#if 1
68	#define DEBUG_INTR(fmt...) printk(fmt)	68	#define DEBUG_INTR(fmt...) printk(fmt)
69	#else	69	#else
70	#define DEBUG_INTR(fmt...) do { } while (0)	70	#define DEBUG_INTR(fmt...) do { } while (0)
Lines 2310-2317 static void serial8250_config_port(struct uart_port *port, int flags) Link Here
2310	* tells us whether we can probe for the type of port.	2310	* tells us whether we can probe for the type of port.
2311	*/	2311	*/
2312	ret = serial8250_request_std_resource(up);	2312	ret = serial8250_request_std_resource(up);
2313	if (ret < 0)	2313	if (ret < 0) {
		2314	printk(KERN_DEBUG "serial8250_config_port: serial8250_request_std_resource() returned %d\n", ret);
2314	return;	2315	return;
		2316	}
2315		2317
2316	ret = serial8250_request_rsa_resource(up);	2318	ret = serial8250_request_rsa_resource(up);
2317	if (ret < 0)	2319	if (ret < 0)