From patchwork Tue Feb 10 17:39:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meelis Roos X-Patchwork-Id: 22880 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 0FFD6DDDA1 for ; Wed, 11 Feb 2009 04:39:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754279AbZBJRj1 (ORCPT ); Tue, 10 Feb 2009 12:39:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753883AbZBJRj1 (ORCPT ); Tue, 10 Feb 2009 12:39:27 -0500 Received: from smtp2.it.da.ut.ee ([193.40.5.67]:53666 "EHLO smtp2.it.da.ut.ee" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753429AbZBJRj0 (ORCPT ); Tue, 10 Feb 2009 12:39:26 -0500 Received: from math.ut.ee (math.ut.ee [193.40.36.2]) by smtp2.it.da.ut.ee (Postfix) with ESMTP id 9D9E073D7EA for ; Tue, 10 Feb 2009 19:39:24 +0200 (EET) Received: by math.ut.ee (Postfix, from userid 1014) id 8FBF4FD7A1; Tue, 10 Feb 2009 19:39:24 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by math.ut.ee (Postfix) with ESMTP id 85A8AFD79B for ; Tue, 10 Feb 2009 19:39:24 +0200 (EET) Date: Tue, 10 Feb 2009 19:39:24 +0200 (EET) From: Meelis Roos To: netdev@vger.kernel.org Subject: [PATCH] fore200: fix oops on failed firmware load Message-ID: MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fore 200 ATM driver fails to handle request_firmware failures and oopses when no firmware file was found. Fix it by checking for the right return values and propaganting the return value up. Signed-off-by: Meelis Roos diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index 937c9c0..10f000d 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c @@ -2519,8 +2519,8 @@ fore200e_load_and_start_fw(struct fore200e* fore200e) return err; sprintf(buf, "%s%s", fore200e->bus->proc_name, FW_EXT); - if (request_firmware(&firmware, buf, device) == 1) { - printk(FORE200E "missing %s firmware image\n", fore200e->bus->model_name); + if ((err = request_firmware(&firmware, buf, device)) < 0) { + printk(FORE200E "problem loading firmware image %s\n", fore200e->bus->model_name); return err; }