← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/char/sonypi.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:
drivers/char/sonypi.c
1241
1241
        while (check_ioport && check->port1) {
1242
1242
                if (!request_region(check->port1,
1243
1243
                                   sonypi_device.region_size,
1244
 
                                   "Sony Programable I/O Device Check")) {
 
1244
                                   "Sony Programmable I/O Device Check")) {
1245
1245
                        printk(KERN_ERR "sonypi: ioport 0x%.4x busy, using sony-laptop? "
1246
1246
                                        "if not use check_ioport=0\n",
1247
1247
                                        check->port1);
1255
1255
 
1256
1256
                if (request_region(ioport_list->port1,
1257
1257
                                   sonypi_device.region_size,
1258
 
                                   "Sony Programable I/O Device")) {
 
1258
                                   "Sony Programmable I/O Device")) {
1259
1259
                        dev->ioport1 = ioport_list->port1;
1260
1260
                        dev->ioport2 = ioport_list->port2;
1261
1261
                        return 0;