From 9c24eb3487d2a9b091896815eff64d191b4ed234 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 9 Mar 2011 19:54:28 +0100 Subject: [PATCH] --- yaml --- r: 242263 b: refs/heads/master c: 507daea2276677785ba8096d90b9e8049632fc46 h: refs/heads/master i: 242261: a4701c2b96b44d914c70968a245fd662e02ca65d 242259: be9811b5ee93a89dbd0753de61eb6e05296dd086 242255: 9ad85d6e3d144f5735b0bf0e3a7917c1a81f065c v: v3 --- [refs] | 2 +- trunk/drivers/block/DAC960.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 840c73259295..e441f889b6c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1b56b93f331bd61492fdb99e7986f7a528ca730 +refs/heads/master: 507daea2276677785ba8096d90b9e8049632fc46 diff --git a/trunk/drivers/block/DAC960.c b/trunk/drivers/block/DAC960.c index 1f286ab461d3..79882104e431 100644 --- a/trunk/drivers/block/DAC960.c +++ b/trunk/drivers/block/DAC960.c @@ -140,13 +140,14 @@ static int DAC960_getgeo(struct block_device *bdev, struct hd_geometry *geo) return 0; } -static int DAC960_media_changed(struct gendisk *disk) +static unsigned int DAC960_check_events(struct gendisk *disk, + unsigned int clearing) { DAC960_Controller_T *p = disk->queue->queuedata; int drive_nr = (long)disk->private_data; if (!p->LogicalDriveInitiallyAccessible[drive_nr]) - return 1; + return DISK_EVENT_MEDIA_CHANGE; return 0; } @@ -163,7 +164,7 @@ static const struct block_device_operations DAC960_BlockDeviceOperations = { .owner = THIS_MODULE, .open = DAC960_open, .getgeo = DAC960_getgeo, - .media_changed = DAC960_media_changed, + .check_events = DAC960_check_events, .revalidate_disk = DAC960_revalidate_disk, }; @@ -2546,6 +2547,7 @@ static bool DAC960_RegisterBlockDevice(DAC960_Controller_T *Controller) disk->major = MajorNumber; disk->first_minor = n << DAC960_MaxPartitionsBits; disk->fops = &DAC960_BlockDeviceOperations; + disk->events = DISK_EVENT_MEDIA_CHANGE; } /* Indicate the Block Device Registration completed successfully,