From: Richard Purdie <rpurdie@rpsys.net>
To: Andrew Morton <akpm@osdl.org>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 11/12] LED: Add IDE disk activity LED trigger
Date: Wed, 08 Feb 2006 02:49:20 +0000 [thread overview]
Message-ID: <1139366960.6422.151.camel@localhost.localdomain> (raw)
In-Reply-To: <1139154893.14624.15.camel@localhost.localdomain>
IDE disk activity fixes:
Catch failure case of driver_register().
Only trigger on blk_fs end requests.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Index: linux-2.6.15/drivers/ide/ide-disk.c
===================================================================
--- linux-2.6.15.orig/drivers/ide/ide-disk.c 2006-02-08 01:09:23.000000000 +0000
+++ linux-2.6.15/drivers/ide/ide-disk.c 2006-02-08 01:08:39.000000000 +0000
@@ -302,7 +302,8 @@
static int ide_end_rw_disk(ide_drive_t *drive, int uptodate, int nr_sectors)
{
- led_trigger_event(ide_led_trigger, LED_OFF);
+ if (blk_fs_request(HWGROUP(drive)->rq))
+ led_trigger_event(ide_led_trigger, LED_OFF);
return ide_end_request(drive, uptodate, nr_sectors);
}
@@ -1251,8 +1252,10 @@
static int __init idedisk_init(void)
{
- led_trigger_register_simple("ide-disk", &ide_led_trigger);
- return driver_register(&idedisk_driver.gen_driver);
+ int ret = driver_register(&idedisk_driver.gen_driver);
+ if (ret >= 0)
+ led_trigger_register_simple("ide-disk", &ide_led_trigger);
+ return ret;
}
MODULE_ALIAS("ide:*m-disk*");
prev parent reply other threads:[~2006-02-08 2:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-05 15:54 Richard Purdie
2006-02-06 16:53 ` Bartlomiej Zolnierkiewicz
2006-02-08 3:12 ` Richard Purdie
2006-02-08 2:49 ` Richard Purdie [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1139366960.6422.151.camel@localhost.localdomain \
--to=rpurdie@rpsys.net \
--cc=akpm@osdl.org \
--cc=bzolnier@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®