X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/420070ce079ea4cdbef144b02f02e940880bc1d8..1eb6639f5e38e474968cfdb9fce2fb0441ad478a:/package/ubsec_ssb/src/ubsec_ssb.c

diff --git a/package/ubsec_ssb/src/ubsec_ssb.c b/package/ubsec_ssb/src/ubsec_ssb.c
index 4ca06d663..d6adf596d 100644
--- a/package/ubsec_ssb/src/ubsec_ssb.c
+++ b/package/ubsec_ssb/src/ubsec_ssb.c
@@ -1,4 +1,3 @@
-/* $Id: $ */
 
 /*
  * Copyright (c) 2008 Daniel Mueller (daniel@danm.de)
@@ -494,7 +493,7 @@ __devinit ubsec_ssb_probe(struct ssb_device *sdev,
     err = ssb_bus_powerup(sdev->bus, 0);
     if (err) {
         dev_err(sdev->dev, "Failed to powerup the bus\n");
-        goto err_powerup;
+	goto err_out;
     }
 
     err = request_irq(sdev->irq, (irq_handler_t)ubsec_ssb_isr, 
@@ -504,11 +503,16 @@ __devinit ubsec_ssb_probe(struct ssb_device *sdev,
         goto err_out_powerdown;
     }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34))
+    err = dma_set_mask(sdev->dma_dev, DMA_BIT_MASK(32)) || 
+	  dma_set_coherent_mask(sdev->dma_dev, DMA_BIT_MASK(32));
+#else
     err = ssb_dma_set_mask(sdev, DMA_32BIT_MASK);
+#endif
     if (err) {
         dev_err(sdev->dev,
         "Required 32BIT DMA mask unsupported by the system.\n");
-        goto err_out_powerdown;
+        goto err_out_free_irq;
     }
 
     printk(KERN_INFO "Sentry5(tm) ROBOGateway(tm) IPSec Core at IRQ %u\n",
@@ -520,7 +524,7 @@ __devinit ubsec_ssb_probe(struct ssb_device *sdev,
     ssb_device_enable(sdev, 0);
 
     if (ubsec_attach(sdev, ent, sdev->dev) != 0)
-        goto err_disable_interrupt;
+        goto err_out_disable;
 
 #ifdef UBSEC_DEBUG
     procdebug = create_proc_entry(DRV_MODULE_NAME, S_IRUSR, NULL);
@@ -534,15 +538,17 @@ __devinit ubsec_ssb_probe(struct ssb_device *sdev,
 
     return 0;
 
-err_disable_interrupt:
+err_out_disable:
+    ssb_device_disable(sdev, 0);
+
+err_out_free_irq:
     free_irq(sdev->irq, sdev);
 
 err_out_powerdown:
     ssb_bus_may_powerdown(sdev->bus);
 
-err_powerup:
-    ssb_device_disable(sdev, 0);
-    return err;    
+err_out:
+    return err;
 }
 
 static void __devexit ubsec_ssb_remove(struct ssb_device *sdev) {
@@ -587,8 +593,8 @@ static void __devexit ubsec_ssb_remove(struct ssb_device *sdev) {
         sc->sc_queuea[i] = NULL;
     }
 
-    ssb_bus_may_powerdown(sdev->bus);
     ssb_device_disable(sdev, 0);
+    ssb_bus_may_powerdown(sdev->bus);
     ssb_set_drvdata(sdev, NULL);
 
 #ifdef UBSEC_DEBUG