Attachment #49920 for bug #113778

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




{
	struct yenta_socket *socket;
	int ret;

	/*
	 * If we failed to assign proper bus numbers for this cardbus
	 * controller during PCI probe, its subordinate pci_bus is NULL.
	 * Bail out if so.
	 */
	if (!dev->subordinate) {
		printk(KERN_ERR "Yenta: no bus associated with %s!\n",
			pci_name(dev));
		return -ENODEV;
	}

	socket = kmalloc(sizeof(struct yenta_socket), GFP_KERNEL);
	if (!socket)
		return -ENOMEM;

Return to bug 113778

Lines 1045-1051 static int __devinit yenta_probe (struct Link Here

(-)2.6.14-rc1/drivers/pcmcia/yenta_socket.c (-1 / +12 lines)
1045	{	1045	{
1046	struct yenta_socket *socket;	1046	struct yenta_socket *socket;
1047	int ret;	1047	int ret;
1048		1048
		1049	/*
		1050	* If we failed to assign proper bus numbers for this cardbus
		1051	* controller during PCI probe, its subordinate pci_bus is NULL.
		1052	* Bail out if so.
		1053	*/
		1054	if (!dev->subordinate) {
		1055	printk(KERN_ERR "Yenta: no bus associated with %s!\n",
		1056	pci_name(dev));
		1057	return -ENODEV;
		1058	}
		1059
1049	socket = kmalloc(sizeof(struct yenta_socket), GFP_KERNEL);	1060	socket = kmalloc(sizeof(struct yenta_socket), GFP_KERNEL);
1050	if (!socket)	1061	if (!socket)
1051	return -ENOMEM;	1062	return -ENOMEM;