Merge ../scsi-rc-fixes-2.6

3 files changed, 29 insertions, 5 deletions

diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index eb57a988e048..cfd2718a490d 100644
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -344,7 +344,7 @@ config HISAX_HFC_SX
 
 config HISAX_ENTERNOW_PCI
         bool "Formula-n enter:now PCI card"
-        depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV))
+        depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV))
         help
           This enables HiSax support for the Formula-n enter:now PCI
           ISDN card.
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index e4823ab2b127..785b08554fca 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -631,7 +631,8 @@ static int HiSax_readstatus(u_char __user *buf, int len, int id, int channel)
                 count = cs->status_end - cs->status_read + 1;
                 if (count >= len)
                         count = len;
-                copy_to_user(p, cs->status_read, count);
+                if (copy_to_user(p, cs->status_read, count))
+                        return -EFAULT;
                 cs->status_read += count;
                 if (cs->status_read > cs->status_end)
                         cs->status_read = cs->status_buf;
@@ -642,7 +643,8 @@ static int HiSax_readstatus(u_char __user *buf, int len, int id, int channel)
                                 cnt = HISAX_STATUS_BUFSIZE;
                         else
                                 cnt = count;
-                        copy_to_user(p, cs->status_read, cnt);
+                        if (copy_to_user(p, cs->status_read, cnt))
+                                return -EFAULT;
                         p += cnt;
                         cs->status_read += cnt % HISAX_STATUS_BUFSIZE;
                         count -= cnt;
diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c
index 7e95f04f13da..3dacfff93f5f 100644
--- a/drivers/isdn/hisax/diva.c
+++ b/drivers/isdn/hisax/diva.c
@@ -716,8 +716,10 @@ release_io_diva(struct IsdnCardState *cs)
 
                 *cfg = 0; /* disable INT0/1 */ 
                 *cfg = 2; /* reset pending INT0 */
-                iounmap((void *)cs->hw.diva.cfg_reg);
-                iounmap((void *)cs->hw.diva.pci_cfg);
+                if (cs->hw.diva.cfg_reg)
+                        iounmap((void *)cs->hw.diva.cfg_reg);
+                if (cs->hw.diva.pci_cfg)
+                        iounmap((void *)cs->hw.diva.pci_cfg);
                 return;
         } else if (cs->subtyp != DIVA_IPAC_ISA) {
                 del_timer(&cs->hw.diva.tl);
@@ -734,6 +736,23 @@ release_io_diva(struct IsdnCardState *cs)
 }
 
 static void
+iounmap_diva(struct IsdnCardState *cs)
+{
+        if ((cs->subtyp == DIVA_IPAC_PCI) || (cs->subtyp == DIVA_IPACX_PCI)) {
+                if (cs->hw.diva.cfg_reg) {
+                        iounmap((void *)cs->hw.diva.cfg_reg);
+                        cs->hw.diva.cfg_reg = 0;
+                }
+                if (cs->hw.diva.pci_cfg) {
+                        iounmap((void *)cs->hw.diva.pci_cfg);
+                        cs->hw.diva.pci_cfg = 0;
+                }
+        }
+
+        return;
+}
+
+static void
 reset_diva(struct IsdnCardState *cs)
 {
         if (cs->subtyp == DIVA_IPAC_ISA) {
@@ -1069,11 +1088,13 @@ setup_diva(struct IsdnCard *card)
 
                 if (!cs->irq) {
                         printk(KERN_WARNING "Diva: No IRQ for PCI card found\n");
+                        iounmap_diva(cs);
                         return(0);
                 }
 
                 if (!cs->hw.diva.cfg_reg) {
                         printk(KERN_WARNING "Diva: No IO-Adr for PCI card found\n");
+                        iounmap_diva(cs);
                         return(0);
                 }
                 cs->irq_flags |= IRQF_SHARED;
@@ -1123,6 +1144,7 @@ ready:
                                CardType[card->typ],
                                cs->hw.diva.cfg_reg,
                                cs->hw.diva.cfg_reg + bytecnt);
+                        iounmap_diva(cs);
                         return (0);
                 }
         }