From 7c4717800babc1c9d2ff3ab84c5302afd2771510 Mon Sep 17 00:00:00 2001 From: Lior Dotan Date: Wed, 5 Nov 2008 11:52:17 +0200 Subject: [PATCH] --- yaml --- r: 126655 b: refs/heads/master c: 66615321f59c6ff98b7bf2e9a3caf04ff30c031b h: refs/heads/master i: 126653: 4da4ed8abfd50e0043987b0e35c35281e25fb3d0 126651: 03b6508cfbf49becd497f53c30712af5d3a42bc0 126647: 99062651acd51d3295d7bb485e632ef724ad105a 126639: 81d736111d1b4421523bd103b7025a5bdb0232b5 126623: 6040c778d1408fd96ecb56c7d11e8a00bfdb9850 126591: fe5d7baf228831808e40333899099be9964b90e4 v: v3 --- [refs] | 2 +- trunk/drivers/staging/slicoss/slicoss.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4ed8c3ff76b3..8e38cc3b2a96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c7e18790c8236ec2bb7581f5337ecff7e31916e +refs/heads/master: 66615321f59c6ff98b7bf2e9a3caf04ff30c031b diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c index b8ac872e070c..d256aef9c431 100644 --- a/trunk/drivers/staging/slicoss/slicoss.c +++ b/trunk/drivers/staging/slicoss/slicoss.c @@ -323,7 +323,7 @@ static void slic_init_adapter(struct net_device *netdev, index, pslic_handle, adapter->pfree_slic_handles, pslic_handle->next);*/ adapter->pshmem = (struct slic_shmem *) pci_alloc_consistent(adapter->pcidev, - sizeof(struct slic_shmem *), + sizeof(struct slic_shmem), &adapter-> phys_shmem); /* @@ -1431,7 +1431,7 @@ static void slic_init_cleanup(struct adapter *adapter) DBG_MSG("adapter[%p] port %d pshmem[%p] FreeShmem ", adapter, adapter->port, (void *) adapter->pshmem); pci_free_consistent(adapter->pcidev, - sizeof(struct slic_shmem *), + sizeof(struct slic_shmem), adapter->pshmem, adapter->phys_shmem); adapter->pshmem = NULL; adapter->phys_shmem = (dma_addr_t) NULL; @@ -2832,7 +2832,7 @@ static u32 slic_card_locate(struct adapter *adapter) } if (!physcard) { /* no structure allocated for this physical card yet */ - physcard = kzalloc(sizeof(struct physcard *), GFP_ATOMIC); + physcard = kzalloc(sizeof(struct physcard), GFP_ATOMIC); ASSERT(physcard); DBG_MSG