From 28a69dce0dbf0da4e3bb9fc9a1f2f6f2a44897b9 Mon Sep 17 00:00:00 2001 From: Andrew Miller Date: Wed, 29 Feb 2012 17:10:08 -0500 Subject: [PATCH] --- yaml --- r: 289165 b: refs/heads/master c: 3be11133bf733d67c3031a08772f4ab0c1a0fc01 h: refs/heads/master i: 289163: 669195d679cf1ccea0036d88aa5a0f025c3e9be2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/lirc/lirc_sasem.c | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index ff8752ade18a..6611f5e62f98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51be392603762ebbff7337bc8af178d33f3ba71e +refs/heads/master: 3be11133bf733d67c3031a08772f4ab0c1a0fc01 diff --git a/trunk/drivers/staging/media/lirc/lirc_sasem.c b/trunk/drivers/staging/media/lirc/lirc_sasem.c index 7855baa18e75..74421043b954 100644 --- a/trunk/drivers/staging/media/lirc/lirc_sasem.c +++ b/trunk/drivers/staging/media/lirc/lirc_sasem.c @@ -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; @@ -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!) */