diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-04 17:55:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-04 17:55:22 -0800 |
| commit | aa641935343e05795f7f7289e7b242138b612ffe (patch) | |
| tree | 54909d05c0ad73b40fae8cc9fbfd0636efbdc246 /drivers/ata/libata-scsi.c | |
| parent | 5da0c7aad6271dd29526e3b49cbeb3bab9e8e491 (diff) | |
| parent | f26792d5c63344e14540ced4b19deb29e360bb8d (diff) | |
Merge branch 'an' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'an' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] Utilize new SCSI event infrastructure
SCSI: add asynchronous event notification API
Diffstat (limited to 'drivers/ata/libata-scsi.c')
| -rw-r--r-- | drivers/ata/libata-scsi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 245057df69d6..94144ed50a6b 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -841,6 +841,9 @@ static void ata_scsi_dev_config(struct scsi_device *sdev, blk_queue_max_hw_segments(q, q->max_hw_segments - 1); } + if (dev->flags & ATA_DFLAG_AN) + set_bit(SDEV_EVT_MEDIA_CHANGE, sdev->supported_events); + if (dev->flags & ATA_DFLAG_NCQ) { int depth; @@ -3296,10 +3299,9 @@ static void ata_scsi_handle_link_detach(struct ata_link *link) */ void ata_scsi_media_change_notify(struct ata_device *dev) { -#ifdef OTHER_AN_PATCHES_HAVE_BEEN_APPLIED if (dev->sdev) - scsi_device_event_notify(dev->sdev, SDEV_MEDIA_CHANGE); -#endif + sdev_evt_send_simple(dev->sdev, SDEV_EVT_MEDIA_CHANGE, + GFP_ATOMIC); } /** |