Merge branch 'linux-2.6' into for-2.6.22

2 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/sysdev/dcr.c b/arch/powerpc/sysdev/dcr.c
index dffeeaeca1d9..1fc5819e7d18 100644
--- a/arch/powerpc/sysdev/dcr.c
+++ b/arch/powerpc/sysdev/dcr.c
@@ -129,7 +129,7 @@ void dcr_unmap(dcr_host_t host, unsigned int dcr_n, unsigned int dcr_c)
 
         if (h.token == NULL)
                 return;
-        h.token -= dcr_n * h.stride;
+        h.token += dcr_n * h.stride;
         iounmap(h.token);
         h.token = NULL;
 }
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c
index e3d71e083f35..43f6cc9d7ea0 100644
--- a/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/arch/powerpc/sysdev/qe_lib/qe.c
@@ -251,13 +251,13 @@ static int qe_sdma_init(void)
 
         /* allocate 2 internal temporary buffers (512 bytes size each) for
          * the SDMA */
-        sdma_buf_offset = qe_muram_alloc(512 * 2, 64);
+        sdma_buf_offset = qe_muram_alloc(512 * 2, 4096);
         if (IS_MURAM_ERR(sdma_buf_offset))
                 return -ENOMEM;
 
         out_be32(&sdma->sdebcr, sdma_buf_offset & QE_SDEBCR_BA_MASK);
-        out_be32(&sdma->sdmr, (QE_SDMR_GLB_1_MSK | (0x1 >>
-                                        QE_SDMR_CEN_SHIFT)));
+        out_be32(&sdma->sdmr, (QE_SDMR_GLB_1_MSK |
+                                        (0x1 << QE_SDMR_CEN_SHIFT)));
 
         return 0;
 }