Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353836
b: refs/heads/master
c: a049728
h: refs/heads/master
v: v3
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent a250a98 commit f4ea745
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4b388a9e1da7156dbf924e38741beaac1b4e29d1
refs/heads/master: a049728928b14cadc6ceb128cedde9f8e5af2b3c
4 changes: 2 additions & 2 deletions trunk/drivers/staging/bcm/Bcmchar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 ",
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/bcm/Debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit f4ea745

Please sign in to comment.