From ac161ca2ea474c3971939a784476c0bbebe5cb67 Mon Sep 17 00:00:00 2001 From: Marek Belisko Date: Fri, 15 Oct 2010 08:57:24 +0200 Subject: [PATCH] --- yaml --- r: 220365 b: refs/heads/master c: dd9b6aa4fd58b3ac39a696e518a09994e687ba72 h: refs/heads/master i: 220363: 7ef0cc3c2ab8419d52ccf9429fe0adc83c0ea22d v: v3 --- [refs] | 2 +- trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5ebf74424148..07b021f41085 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e09aee2a525218c428109cd16f871585e696b1f3 +refs/heads/master: dd9b6aa4fd58b3ac39a696e518a09994e687ba72 diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c index 44c475b3505d..a2c415e1b8f7 100644 --- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c +++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c @@ -159,7 +159,11 @@ static int ft1000_probe(struct usb_interface *interface, release_firmware(dsp_fw); DEBUG("ft1000_probe: start downloading dsp image...\n"); - init_ft1000_netdev(ft1000dev); + + ret = init_ft1000_netdev(ft1000dev); + if (ret) + goto err_load; + pft1000info = (FT1000_INFO *) netdev_priv(ft1000dev->net); DEBUG("In probe: pft1000info=%p\n", pft1000info);