Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353809
b: refs/heads/master
c: a23e67f
h: refs/heads/master
i:
  353807: c44bbdc
v: v3
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent 136bad5 commit e81d907
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 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: c081e78bd41786dc7144757bfa4a7e477cb4da38
refs/heads/master: a23e67f1a26bef151595cd3373d489683cf1fe80
2 changes: 1 addition & 1 deletion trunk/drivers/staging/bcm/Bcmchar.c
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
}

case IOCTL_BCM_GET_CURRENT_STATUS: {
LINK_STATE link_state;
struct bcm_link_state link_state;

/* Copy Ioctl Buffer structure */
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) {
Expand Down
6 changes: 2 additions & 4 deletions trunk/drivers/staging/bcm/Macros.h
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,11 @@
#define GPIO_MODE_REGISTER 0x0F000034
#define GPIO_PIN_STATE_REGISTER 0x0F000038


typedef struct _LINK_STATE {
struct bcm_link_state {
UCHAR ucLinkStatus;
UCHAR bIdleMode;
UCHAR bShutdownMode;
} LINK_STATE, *PLINK_STATE;

};

enum enLinkStatus {
WAIT_FOR_SYNC = 1,
Expand Down

0 comments on commit e81d907

Please sign in to comment.