Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 38141
b: refs/heads/master
c: 3879b6b
h: refs/heads/master
i:
  38139: 7289d19
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Oct 3, 2006
1 parent 18ea9ae commit 1fb7769
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 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: 20f43535694bb19e1bb45917b73b7e5cd5d74818
refs/heads/master: 3879b6b6a8ee39b50559b2c2dd083c557d39e0f8
2 changes: 2 additions & 0 deletions trunk/drivers/isdn/sc/event.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ int indicate_status(int card, int event,ulong Channel,char *Data)
{
isdn_ctrl cmd;

#ifdef DEBUG
pr_debug("%s: Indicating event %s on Channel %d\n",
sc_adapter[card]->devicename, events[event-256], Channel);
#endif
if (Data != NULL){
pr_debug("%s: Event data: %s\n", sc_adapter[card]->devicename,
Data);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/isdn/sc/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ irqreturn_t interrupt_handler(int interrupt, void *cardptr, struct pt_regs *regs
*/
if (IS_CE_MESSAGE(rcvmsg, Lnk, 1, Read))
{
pr_debug("%s: Received packet 0x%x bytes long at 0x%x\n",
pr_debug("%s: Received packet 0x%x bytes long at 0x%lx\n",
sc_adapter[card]->devicename,
rcvmsg.msg_data.response.msg_len,
rcvmsg.msg_data.response.buff_offset);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/isdn/sc/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ void check_reset(unsigned long data)
if (sc_adapter[card]->StartOnReset)
startproc(card);
} else {
pr_debug("%s: No signature yet, waiting another %d jiffies.\n",
pr_debug("%s: No signature yet, waiting another %lu jiffies.\n",
sc_adapter[card]->devicename, CHECKRESET_TIME);
mod_timer(&sc_adapter[card]->reset_timer, jiffies+CHECKRESET_TIME);
spin_unlock_irqrestore(&sc_adapter[card]->lock, flags);
Expand Down

0 comments on commit 1fb7769

Please sign in to comment.