On Fri, Apr 11, 2014 at 08:19:42AM +0400, Antony Pavlov wrote:
> Signed-off-by: Antony Pavlov <antonynpavlov@xxxxxxxxx>
Applied, thanks
Sascha
> ---
> drivers/net/usb/asix.c | 17 ++++++++---------
> 1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c
> index 37057a7..2145d3f 100644
> --- a/drivers/net/usb/asix.c
> +++ b/drivers/net/usb/asix.c
> @@ -286,7 +286,7 @@ static int asix_sw_reset(struct usbnet *dev, u8 flags)
> {
> int ret;
>
> - ret = asix_write_cmd(dev, AX_CMD_SW_RESET, flags, 0, 0, NULL);
> + ret = asix_write_cmd(dev, AX_CMD_SW_RESET, flags, 0, 0, NULL);
> if (ret < 0)
> dev_err(&dev->edev.dev, "Failed to send software reset: %02x\n", ret);
>
> @@ -453,8 +453,8 @@ static int asix_rx_fixup(struct usbnet *dev, void *buf, int len)
> }
>
> static int asix_tx_fixup(struct usbnet *dev,
> - void *buf, int len,
> - void *nbuf, int *nlen)
> + void *buf, int len,
> + void *nbuf, int *nlen)
> {
> unsigned int packet_len;
>
> @@ -696,10 +696,10 @@ static struct driver_info ax88772b_info = {
> .description = "ASIX AX88772B USB 2.0 Ethernet",
> .bind = ax88772_bind,
> .unbind = asix_unbind,
> - .flags = FLAG_ETHER | FLAG_FRAMING_AX,
> - .rx_fixup = asix_rx_fixup,
> - .tx_fixup = asix_tx_fixup,
> - .data = FLAG_EEPROM_MAC,
> + .flags = FLAG_ETHER | FLAG_FRAMING_AX,
> + .rx_fixup = asix_rx_fixup,
> + .tx_fixup = asix_tx_fixup,
> + .data = FLAG_EEPROM_MAC,
> };
>
> static const struct usb_device_id products [] = {
> @@ -800,7 +800,6 @@ static struct usb_driver asix_driver = {
>
> static int __init asix_init(void)
> {
> - return usb_driver_register(&asix_driver);
> + return usb_driver_register(&asix_driver);
> }
> device_initcall(asix_init);
> -
> --
> 1.9.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
