From f4ea7455f924519c3bc5159d2cfae1f3660ec772 Mon Sep 17 00:00:00 2001 From: Kevin McKinney Date: Fri, 4 Jan 2013 23:35:09 -0500 Subject: [PATCH] --- yaml --- r: 353836 b: refs/heads/master c: a049728928b14cadc6ceb128cedde9f8e5af2b3c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/bcm/Bcmchar.c | 4 ++-- trunk/drivers/staging/bcm/Debug.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index addb870b4cdb..6380ad12842c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b388a9e1da7156dbf924e38741beaac1b4e29d1 +refs/heads/master: a049728928b14cadc6ceb128cedde9f8e5af2b3c diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c index b034ace7eacd..4ba1a5d1bf96 100644 --- a/trunk/drivers/staging/bcm/Bcmchar.c +++ b/trunk/drivers/staging/bcm/Bcmchar.c @@ -1229,13 +1229,13 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) case IOCTL_BCM_SET_DEBUG: #ifdef DEBUG { - USER_BCM_DBG_STATE sUserDebugState; + struct bcm_user_debug_state sUserDebugState; BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "In SET_DEBUG ioctl\n"); if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) return -EFAULT; - if (copy_from_user(&sUserDebugState, IoBuffer.InputBuffer, sizeof(USER_BCM_DBG_STATE))) + if (copy_from_user(&sUserDebugState, IoBuffer.InputBuffer, sizeof(struct bcm_user_debug_state))) return -EFAULT; BCM_DEBUG_PRINT (Adapter, DBG_TYPE_PRINTK, 0, 0, "IOCTL_BCM_SET_DEBUG: OnOff=%d Type = 0x%x ", diff --git a/trunk/drivers/staging/bcm/Debug.h b/trunk/drivers/staging/bcm/Debug.h index e81db0d0f7a3..03be63fbff45 100644 --- a/trunk/drivers/staging/bcm/Debug.h +++ b/trunk/drivers/staging/bcm/Debug.h @@ -171,11 +171,11 @@ * Delibrately matches that of the Windows driver.. * The TestApp's ioctl passes this struct to us. */ -typedef struct { +struct bcm_user_debug_state { unsigned int Subtype, Type; unsigned int OnOff; /* unsigned int debug_level; future expansion */ -} __packed USER_BCM_DBG_STATE; +} __packed; /* ---Kernel-space mapping of Debug State */ struct bcm_debug_state {