patch-2.4.0-test2 linux/drivers/ieee1394/aic5800.c
Next file: linux/drivers/ieee1394/guid.c
Previous file: linux/drivers/ieee1394/Makefile
Back to the patch index
Back to the overall index
- Lines: 20
- Date:
Mon Jun 19 17:59:40 2000
- Orig file:
v2.4.0-test1/linux/drivers/ieee1394/aic5800.c
- Orig date:
Thu Mar 2 14:36:22 2000
diff -u --recursive --new-file v2.4.0-test1/linux/drivers/ieee1394/aic5800.c linux/drivers/ieee1394/aic5800.c
@@ -723,14 +723,17 @@
static int add_card(struct pci_dev *dev)
{
-#define FAIL(fmt, args...) \
+#define FAIL(fmt, args...) do {\
PRINT_G(KERN_ERR, fmt , ## args); \
num_of_cards--; \
remove_card(aic); \
- return 1;
+ return 1; } while (0)
struct aic5800 *aic; /* shortcut to currently handled device */
unsigned long page;
+
+ if (pci_enable_device(dev))
+ return 1;
if (num_of_cards == MAX_AIC5800_CARDS) {
PRINT_G(KERN_WARNING, "cannot handle more than %d cards. "
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)