diff options
Diffstat (limited to 'drivers/net/usb/catc.c')
-rw-r--r-- | drivers/net/usb/catc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c index 97687d335903..8056f8a27c6a 100644 --- a/drivers/net/usb/catc.c +++ b/drivers/net/usb/catc.c | |||
@@ -495,7 +495,7 @@ static void catc_ctrl_run(struct catc *catc) | |||
495 | if (!q->dir && q->buf && q->len) | 495 | if (!q->dir && q->buf && q->len) |
496 | memcpy(catc->ctrl_buf, q->buf, q->len); | 496 | memcpy(catc->ctrl_buf, q->buf, q->len); |
497 | 497 | ||
498 | if ((status = usb_submit_urb(catc->ctrl_urb, GFP_KERNEL))) | 498 | if ((status = usb_submit_urb(catc->ctrl_urb, GFP_ATOMIC))) |
499 | err("submit(ctrl_urb) status %d", status); | 499 | err("submit(ctrl_urb) status %d", status); |
500 | } | 500 | } |
501 | 501 | ||
@@ -686,7 +686,7 @@ static int catc_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
686 | 686 | ||
687 | cmd->supported = SUPPORTED_10baseT_Half | SUPPORTED_TP; | 687 | cmd->supported = SUPPORTED_10baseT_Half | SUPPORTED_TP; |
688 | cmd->advertising = ADVERTISED_10baseT_Half | ADVERTISED_TP; | 688 | cmd->advertising = ADVERTISED_10baseT_Half | ADVERTISED_TP; |
689 | cmd->speed = SPEED_10; | 689 | ethtool_cmd_speed_set(cmd, SPEED_10); |
690 | cmd->duplex = DUPLEX_HALF; | 690 | cmd->duplex = DUPLEX_HALF; |
691 | cmd->port = PORT_TP; | 691 | cmd->port = PORT_TP; |
692 | cmd->phy_address = 0; | 692 | cmd->phy_address = 0; |