Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235494
b: refs/heads/master
c: c1605f2
h: refs/heads/master
v: v3
  • Loading branch information
Pavan Savoy authored and Greg Kroah-Hartman committed Mar 10, 2011
1 parent de435aa commit 5070127
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 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: d5c97c1099f5617dc1ba3d1f0058d1341b1faf4c
refs/heads/master: c1605f2e3312ca149caf32129e0b25b1e7296f36
18 changes: 4 additions & 14 deletions trunk/drivers/misc/ti-st/st_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -475,9 +475,9 @@ void kim_st_list_protocols(struct st_data_s *st_gdata, void *buf)
{
seq_printf(buf, "[%d]\nBT=%c\nFM=%c\nGPS=%c\n",
st_gdata->protos_registered,
st_gdata->list[ST_BT] != NULL ? 'R' : 'U',
st_gdata->list[ST_FM] != NULL ? 'R' : 'U',
st_gdata->list[ST_GPS] != NULL ? 'R' : 'U');
st_gdata->list[0x04] != NULL ? 'R' : 'U',
st_gdata->list[0x08] != NULL ? 'R' : 'U',
st_gdata->list[0x09] != NULL ? 'R' : 'U');
}

/********************************************************************/
Expand Down Expand Up @@ -644,9 +644,6 @@ long st_unregister(struct st_proto_s *proto)
long st_write(struct sk_buff *skb)
{
struct st_data_s *st_gdata;
#ifdef DEBUG
unsigned char chnl_id = ST_MAX_CHANNELS;
#endif
long len;

st_kim_ref(&st_gdata, 0);
Expand All @@ -655,14 +652,7 @@ long st_write(struct sk_buff *skb)
pr_err("data/tty unavailable to perform write");
return -EINVAL;
}
#ifdef DEBUG /* open-up skb to read the 1st byte */
chnl_id = skb->data[0];
if (unlikely(st_gdata->list[chnl_id] == NULL)) {
pr_err(" chnl_id %d not registered, and writing? ",
chnl_id);
return -EINVAL;
}
#endif

pr_debug("%d to be written", skb->len);
len = skb->len;

Expand Down

0 comments on commit 5070127

Please sign in to comment.