diff options
author | Dirk Brandewie <dirk.j.brandewie@intel.com> | 2009-08-12 14:29:46 -0400 |
---|---|---|
committer | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-10-19 02:55:44 -0400 |
commit | 2093586de29418820b89aae05746511392f8ad73 (patch) | |
tree | b5d021b77a886380e3ac529e6a837b063cff0779 /drivers/net/wimax/i2400m/usb-fw.c | |
parent | 8bec9a5efd5691c5a32d85da1da09643290ebb72 (diff) |
wimax/i2400m: USB driver uses a configurable endpoint map
Newer generations of the i2400m USB WiMAX device use a different
endpoint map; in order to make it easy to support it, we make the
endpoint-to-function mapeable instead of static.
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Diffstat (limited to 'drivers/net/wimax/i2400m/usb-fw.c')
-rw-r--r-- | drivers/net/wimax/i2400m/usb-fw.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wimax/i2400m/usb-fw.c b/drivers/net/wimax/i2400m/usb-fw.c index 5ad287c228b8..a2250e49a444 100644 --- a/drivers/net/wimax/i2400m/usb-fw.c +++ b/drivers/net/wimax/i2400m/usb-fw.c | |||
@@ -99,7 +99,7 @@ ssize_t i2400mu_tx_bulk_out(struct i2400mu *i2400mu, void *buf, size_t buf_size) | |||
99 | dev_err(dev, "BM-CMD: can't get autopm: %d\n", result); | 99 | dev_err(dev, "BM-CMD: can't get autopm: %d\n", result); |
100 | do_autopm = 0; | 100 | do_autopm = 0; |
101 | } | 101 | } |
102 | epd = usb_get_epd(i2400mu->usb_iface, I2400MU_EP_BULK_OUT); | 102 | epd = usb_get_epd(i2400mu->usb_iface, i2400mu->endpoint_cfg.bulk_out); |
103 | pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress); | 103 | pipe = usb_sndbulkpipe(i2400mu->usb_dev, epd->bEndpointAddress); |
104 | retry: | 104 | retry: |
105 | result = usb_bulk_msg(i2400mu->usb_dev, pipe, buf, buf_size, &len, HZ); | 105 | result = usb_bulk_msg(i2400mu->usb_dev, pipe, buf, buf_size, &len, HZ); |
@@ -226,7 +226,8 @@ int i2400mu_notif_submit(struct i2400mu *i2400mu, struct urb *urb, | |||
226 | struct usb_endpoint_descriptor *epd; | 226 | struct usb_endpoint_descriptor *epd; |
227 | int pipe; | 227 | int pipe; |
228 | 228 | ||
229 | epd = usb_get_epd(i2400mu->usb_iface, I2400MU_EP_NOTIFICATION); | 229 | epd = usb_get_epd(i2400mu->usb_iface, |
230 | i2400mu->endpoint_cfg.notification); | ||
230 | pipe = usb_rcvintpipe(i2400mu->usb_dev, epd->bEndpointAddress); | 231 | pipe = usb_rcvintpipe(i2400mu->usb_dev, epd->bEndpointAddress); |
231 | usb_fill_int_urb(urb, i2400mu->usb_dev, pipe, | 232 | usb_fill_int_urb(urb, i2400mu->usb_dev, pipe, |
232 | i2400m->bm_ack_buf, I2400M_BM_ACK_BUF_SIZE, | 233 | i2400m->bm_ack_buf, I2400M_BM_ACK_BUF_SIZE, |