Merge branch 'for-paul-38-rebased' of git://gitorious.org/linux-omap-dss2/linux

[mv-sheeva.git] / drivers / staging / rt2860 / rt_main_dev.c

diff --git a/drivers/staging/rt2860/rt_main_dev.c b/drivers/staging/rt2860/rt_main_dev.c
index 19e9bc6569f88d18e1895666a3685c15c1ce5f9f..701561d6b6fdc03a4ecad832ef39940653a023a4 100644 (file)
--- a/drivers/staging/rt2860/rt_main_dev.c
+++ b/drivers/staging/rt2860/rt_main_dev.c
@@ -102,8 +102,8 @@ int MainVirtualIF_close(IN struct net_device *net_dev)
                    (!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST))) {
                        struct rt_mlme_disassoc_req DisReq;
                        struct rt_mlme_queue_elem *MsgElem =
-                           (struct rt_mlme_queue_elem *)kmalloc(sizeof(struct rt_mlme_queue_elem),
-                                                       MEM_ALLOC_FLAG);
+                               kmalloc(sizeof(struct rt_mlme_queue_elem),
+                                       MEM_ALLOC_FLAG);
 
                        if (MsgElem) {
                                COPY_MAC_ADDR(DisReq.Addr,
@@ -421,7 +421,7 @@ int rt28xx_open(struct net_device *dev)
        {
                u32 reg = 0;
                RTMP_IO_READ32(pAd, 0x1300, &reg);      /* clear garbage interrupts */
-               printk("0x1300 = %08x\n", reg);
+               printk(KERN_DEBUG "0x1300 = %08x\n", reg);
        }
 
        {
@@ -725,7 +725,8 @@ Note:
 int AdapterBlockAllocateMemory(void *handle, void ** ppAd)
 {
 
-       *ppAd = (void *)vmalloc(sizeof(struct rt_rtmp_adapter));        /*pci_alloc_consistent(pci_dev, sizeof(struct rt_rtmp_adapter), phy_addr); */
+       *ppAd = vmalloc(sizeof(struct rt_rtmp_adapter));
+       /* pci_alloc_consistent(pci_dev, sizeof(struct rt_rtmp_adapter), phy_addr); */
 
        if (*ppAd) {
                NdisZeroMemory(*ppAd, sizeof(struct rt_rtmp_adapter));