Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 20 insertions, 6 deletions

diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c
index 517271c762e6..911e1da6def2 100644
--- a/drivers/char/ip2/ip2main.c
+++ b/drivers/char/ip2/ip2main.c
@@ -208,6 +208,7 @@ static int DumpFifoBuffer( char __user *, int);
 
 static void ip2_init_board(int, const struct firmware *);
 static unsigned short find_eisa_board(int);
+static int ip2_setup(char *str);
 
 /***************/
 /* Static Data */
@@ -263,7 +264,7 @@ static int tracewrap;
 /* Macros */
 /**********/
 
-#if defined(MODULE) && defined(IP2DEBUG_OPEN)
+#ifdef IP2DEBUG_OPEN
 #define DBG_CNT(s) printk(KERN_DEBUG "(%s): [%x] ttyc=%d, modc=%x -> %s\n", \
                     tty->name,(pCh->flags), \
                     tty->count,/*GET_USE_COUNT(module)*/0,s)
@@ -285,7 +286,10 @@ MODULE_AUTHOR("Doug McNash");
 MODULE_DESCRIPTION("Computone IntelliPort Plus Driver");
 MODULE_LICENSE("GPL");
 
+#define MAX_CMD_STR     50
+
 static int poll_only;
+static char cmd[MAX_CMD_STR];
 
 static int Eisa_irq;
 static int Eisa_slot;
@@ -309,6 +313,8 @@ module_param_array(io, int, NULL, 0);
 MODULE_PARM_DESC(io, "I/O ports for IntelliPort Cards");
 module_param(poll_only, bool, 0);
 MODULE_PARM_DESC(poll_only, "Do not use card interrupts");
+module_param_string(ip2, cmd, MAX_CMD_STR, 0);
+MODULE_PARM_DESC(ip2, "Contains module parameter passed with 'ip2='");
 
 /* for sysfs class support */
 static struct class *ip2_class;
@@ -487,7 +493,6 @@ static const struct firmware *ip2_request_firmware(void)
         return fw;
 }
 
-#ifndef MODULE
 /******************************************************************************
  *      ip2_setup:
  *              str: kernel command line string
@@ -531,7 +536,6 @@ static int __init ip2_setup(char *str)
         return 1;
 }
 __setup("ip2=", ip2_setup);
-#endif /* !MODULE */
 
 static int __init ip2_loadmain(void)
 {
@@ -539,14 +543,20 @@ static int __init ip2_loadmain(void)
         int err = 0;
         i2eBordStrPtr pB = NULL;
         int rc = -1;
-        struct pci_dev *pdev = NULL;
         const struct firmware *fw = NULL;
+        char *str;
+
+        str = cmd;
 
         if (poll_only) {
                 /* Hard lock the interrupts to zero */
                 irq[0] = irq[1] = irq[2] = irq[3] = poll_only = 0;
         }
 
+        /* Check module parameter with 'ip2=' has been passed or not */
+        if (!poll_only && (!strncmp(str, "ip2=", 4)))
+                ip2_setup(str);
+
         ip2trace(ITRC_NO_PORT, ITRC_INIT, ITRC_ENTER, 0);
 
         /* process command line arguments to modprobe or
@@ -612,6 +622,7 @@ static int __init ip2_loadmain(void)
                 case PCI:
 #ifdef CONFIG_PCI
                 {
+                        struct pci_dev *pdev = NULL;
                         u32 addr;
                         int status;
 
@@ -626,7 +637,7 @@ static int __init ip2_loadmain(void)
 
                         if (pci_enable_device(pdev)) {
                                 dev_err(&pdev->dev, "can't enable device\n");
-                                break;
+                                goto out;
                         }
                         ip2config.type[i] = PCI;
                         ip2config.pci_dev[i] = pci_dev_get(pdev);
@@ -638,6 +649,8 @@ static int __init ip2_loadmain(void)
                                 dev_err(&pdev->dev, "I/O address error\n");
 
                         ip2config.irq[i] = pdev->irq;
+out:
+                        pci_dev_put(pdev);
                 }
 #else
                         printk(KERN_ERR "IP2: PCI card specified but PCI "
@@ -656,7 +669,6 @@ static int __init ip2_loadmain(void)
                         break;
                 }       /* switch */
         }       /* for */
-        pci_dev_put(pdev);
 
         for (i = 0; i < IP2_MAX_BOARDS; ++i) {
                 if (ip2config.addr[i]) {
@@ -3197,3 +3209,5 @@ static struct pci_device_id ip2main_pci_tbl[] __devinitdata = {
 };
 
 MODULE_DEVICE_TABLE(pci, ip2main_pci_tbl);
+
+MODULE_FIRMWARE("intelliport2.bin");