Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 289165
b: refs/heads/master
c: 3be1113
h: refs/heads/master
i:
  289163: 669195d
v: v3
  • Loading branch information
Andrew Miller authored and Greg Kroah-Hartman committed Feb 29, 2012
1 parent 0423f0d commit 28a69dc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 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: 51be392603762ebbff7337bc8af178d33f3ba71e
refs/heads/master: 3be11133bf733d67c3031a08772f4ab0c1a0fc01
17 changes: 9 additions & 8 deletions trunk/drivers/staging/media/lirc/lirc_sasem.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ static void __exit sasem_exit(void);
struct sasem_context {

struct usb_device *dev;
int vfd_isopen; /* VFD port has been opened */
unsigned int vfd_contrast; /* VFD contrast */
int ir_isopen; /* IR port has been opened */
int dev_present; /* USB device presence */
struct mutex ctx_lock; /* to lock this object */
int vfd_isopen; /* VFD port has been opened */
unsigned int vfd_contrast; /* VFD contrast */
int ir_isopen; /* IR port has been opened */
int dev_present; /* USB device presence */
struct mutex ctx_lock; /* to lock this object */
wait_queue_head_t remove_ok; /* For unexpected USB disconnects */

struct lirc_driver *driver;
Expand All @@ -106,10 +106,11 @@ struct sasem_context {
unsigned char usb_tx_buf[8];

struct tx_t {
unsigned char data_buf[SASEM_DATA_BUF_SZ]; /* user data buffer */
unsigned char data_buf[SASEM_DATA_BUF_SZ]; /* user data
* buffer */
struct completion finished; /* wait for write to finish */
atomic_t busy; /* write in progress */
int status; /* status of tx completion */
atomic_t busy; /* write in progress */
int status; /* status of tx completion */
} tx;

/* for dealing with repeat codes (wish there was a toggle bit!) */
Expand Down

0 comments on commit 28a69dc

Please sign in to comment.