← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to drivers/media/video/pvrusb2/pvrusb2-hdw.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, John Rigby
  • Date: 2011-01-08 18:34:41 UTC
  • Revision ID: james.westby@ubuntu.com-20110108183441-002wttt2gz2sah4b
Tags: 2.6.37-1002.5
https://launchpad.net/bugs/697317
[ John Rigby ]

* rebase to new upstreams: 
  v2.6.37 final
  Ubuntu-2.6.37-12.28
* Clean up lintian errors and warnings
  - LP: #697317

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/media/video/pvrusb2/pvrusb2-hdw.c
2088
2088
                           " Setting up with specified i2c address 0x%x",
2089
2089
                           mid, i2caddr[0]);
2090
2090
                sd = v4l2_i2c_new_subdev(&hdw->v4l2_dev, &hdw->i2c_adap,
2091
 
                                         NULL, fname,
2092
 
                                         i2caddr[0], NULL);
 
2091
                                         fname, i2caddr[0], NULL);
2093
2092
        } else {
2094
2093
                pvr2_trace(PVR2_TRACE_INIT,
2095
2094
                           "Module ID %u:"
2096
2095
                           " Setting up with address probe list",
2097
2096
                           mid);
2098
2097
                sd = v4l2_i2c_new_subdev(&hdw->v4l2_dev, &hdw->i2c_adap,
2099
 
                                                NULL, fname,
2100
 
                                                0, i2caddr);
 
2098
                                         fname, 0, i2caddr);
2101
2099
        }
2102
2100
 
2103
2101
        if (!sd) {