lkml.org 
[lkml]   [2006]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH 11/12] LED: Add IDE disk activity LED trigger
From
Date
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*");

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-02-08 03:51    [W:0.031 / U:0.840 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site