From 9a095e02d5a85207a5cf4d0bf5e345192a269173 Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Thu, 22 Nov 2012 14:48:40 -0500 Subject: [PATCH] --- yaml --- r: 338165 b: refs/heads/master c: 63df64a27a42deb75907b411f0e2f5916febc241 h: refs/heads/master i: 338163: 05ba32d6d9afbe86694c80488930ccb2ca629584 v: v3 --- [refs] | 2 +- trunk/drivers/staging/bcm/Bcmchar.c | 6 +++--- trunk/drivers/staging/bcm/Ioctl.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d3229408f7da..a72bc511d4ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e91edb71d899818ca769aa372372a8ed998357a +refs/heads/master: 63df64a27a42deb75907b411f0e2f5916febc241 diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c index 73ed3d60d4fc..f3762163b5aa 100644 --- a/trunk/drivers/staging/bcm/Bcmchar.c +++ b/trunk/drivers/staging/bcm/Bcmchar.c @@ -552,10 +552,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) case IOCTL_BCM_GPIO_MULTI_REQUEST: { UCHAR ucResetValue[4]; - GPIO_MULTI_INFO gpio_multi_info[MAX_IDX]; - PGPIO_MULTI_INFO pgpio_multi_info = (PGPIO_MULTI_INFO)gpio_multi_info; + struct bcm_gpio_multi_info gpio_multi_info[MAX_IDX]; + struct bcm_gpio_multi_info *pgpio_multi_info = (struct bcm_gpio_multi_info *)gpio_multi_info; - memset(pgpio_multi_info, 0, MAX_IDX * sizeof(GPIO_MULTI_INFO)); + memset(pgpio_multi_info, 0, MAX_IDX * sizeof(struct bcm_gpio_multi_info)); if ((Adapter->IdleMode == TRUE) || (Adapter->bShutStatus == TRUE) || diff --git a/trunk/drivers/staging/bcm/Ioctl.h b/trunk/drivers/staging/bcm/Ioctl.h index f5d9b4af49f7..6f112c8e1215 100644 --- a/trunk/drivers/staging/bcm/Ioctl.h +++ b/trunk/drivers/staging/bcm/Ioctl.h @@ -219,11 +219,11 @@ enum { MAX_IDX }; -typedef struct stGPIOMultiInfo { +struct bcm_gpio_multi_info { unsigned int uiGPIOCommand; /* 1 for set and 0 for get */ unsigned int uiGPIOMask; /* set the correspondig bit to 1 to access GPIO */ unsigned int uiGPIOValue; /* 0 or 1; value to be set when command is 1. */ -} __packed GPIO_MULTI_INFO, *PGPIO_MULTI_INFO; +} __packed; struct bcm_gpio_multi_mode { unsigned int uiGPIOMode; /* 1 for OUT mode, 0 for IN mode */