~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/block/DAC960.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
140
140
        return 0;
141
141
}
142
142
 
143
 
static int DAC960_media_changed(struct gendisk *disk)
 
143
static unsigned int DAC960_check_events(struct gendisk *disk,
 
144
                                        unsigned int clearing)
144
145
{
145
146
        DAC960_Controller_T *p = disk->queue->queuedata;
146
147
        int drive_nr = (long)disk->private_data;
147
148
 
148
149
        if (!p->LogicalDriveInitiallyAccessible[drive_nr])
149
 
                return 1;
 
150
                return DISK_EVENT_MEDIA_CHANGE;
150
151
        return 0;
151
152
}
152
153
 
163
164
        .owner                  = THIS_MODULE,
164
165
        .open                   = DAC960_open,
165
166
        .getgeo                 = DAC960_getgeo,
166
 
        .media_changed          = DAC960_media_changed,
 
167
        .check_events           = DAC960_check_events,
167
168
        .revalidate_disk        = DAC960_revalidate_disk,
168
169
};
169
170
 
1789
1790
  unsigned short LogicalDeviceNumber = 0;
1790
1791
  int ModelNameLength;
1791
1792
 
1792
 
  /* Get data into dma-able area, then copy into permanant location */
 
1793
  /* Get data into dma-able area, then copy into permanent location */
1793
1794
  if (!DAC960_V2_NewControllerInfo(Controller))
1794
1795
    return DAC960_Failure(Controller, "GET CONTROLLER INFO");
1795
1796
  memcpy(ControllerInfo, Controller->V2.NewControllerInformation,